diff --git a/Directory.Build.props b/Directory.Build.props index 6ff156a6..4834e4f0 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,7 +2,7 @@ - 3.407.0 + 3.800.0 $(VersionSuffix)-$(BuildNumber) diff --git a/samples/VirtoCommerce.NotificationsSampleModule.Tests/Tests/SocialNetworkNotificationEntityUnitTests.cs b/samples/VirtoCommerce.NotificationsSampleModule.Tests/Tests/SocialNetworkNotificationEntityUnitTests.cs index 73b249cf..fdd88016 100644 --- a/samples/VirtoCommerce.NotificationsSampleModule.Tests/Tests/SocialNetworkNotificationEntityUnitTests.cs +++ b/samples/VirtoCommerce.NotificationsSampleModule.Tests/Tests/SocialNetworkNotificationEntityUnitTests.cs @@ -107,7 +107,7 @@ public SocialNetworkNotificationEntityUnitTests() _mockUnitOfWork = new Mock(); _repositoryMock.Setup(ss => ss.UnitOfWork).Returns(_mockUnitOfWork.Object); _eventPublisherMock = new Mock(); - var templateLoader = new Mock(); + var templateLoader = new Mock(); _memCache = GetCache(); _notificationService = new NotificationService(_repositoryFactory, _eventPublisherMock.Object, templateLoader.Object, _memCache); _notificationServiceMock = new Mock(); @@ -127,7 +127,7 @@ public async Task GetNotificationByTypeAsync_ReturnNotification() var type = nameof(RegistrationSocialNetworkNotification); var mockNotifications = new List().AsQueryable().BuildMock(); - _repositoryMock.Setup(r => r.Notifications).Returns(mockNotifications.Object); + _repositoryMock.Setup(r => r.Notifications).Returns(mockNotifications); _notificationRegistrar.RegisterNotification(); //Act @@ -147,7 +147,7 @@ public async Task GetNotificationsByIdsAsync_ReturnNotifications() var responseGroup = NotificationResponseGroup.Default.ToString(); _repositoryMock.Setup(n => n.GetByIdsAsync(new[] { id }, responseGroup)).ReturnsAsync(notifications.ToArray()); var notificationsMock = notifications.AsQueryable().BuildMock(); - _repositoryMock.Setup(x => x.Notifications).Returns(notificationsMock.Object); + _repositoryMock.Setup(x => x.Notifications).Returns(notificationsMock); _notificationRegistrar.RegisterNotification(); //Act @@ -177,7 +177,7 @@ public async Task SaveChangesAsync_SavedNotification() _repositoryMock.Setup(n => n.GetByIdsAsync(new[] { id }, NotificationResponseGroup.Full.ToString())) .ReturnsAsync(notificationEntities.ToArray()); var notificationsMock = notificationEntities.AsQueryable().BuildMock(); - _repositoryMock.Setup(x => x.Notifications).Returns(notificationsMock.Object); + _repositoryMock.Setup(x => x.Notifications).Returns(notificationsMock); var notifications = notificationEntities.Select(n => n.ToModel(AbstractTypeFactory.TryCreateInstance(n.Type))); //Act @@ -186,7 +186,7 @@ public async Task SaveChangesAsync_SavedNotification() private static IPlatformMemoryCache GetCache() { - var defaultOptions = Options.Create(new CachingOptions() {}); + var defaultOptions = Options.Create(new CachingOptions() { }); var logger = new Moq.Mock>(); return new PlatformMemoryCache(new MemoryCache(new MemoryCacheOptions()), defaultOptions, logger.Object); } diff --git a/samples/VirtoCommerce.NotificationsSampleModule.Tests/VirtoCommerce.NotificationsSampleModule.Tests.csproj b/samples/VirtoCommerce.NotificationsSampleModule.Tests/VirtoCommerce.NotificationsSampleModule.Tests.csproj index a6216c59..2d83bc0d 100644 --- a/samples/VirtoCommerce.NotificationsSampleModule.Tests/VirtoCommerce.NotificationsSampleModule.Tests.csproj +++ b/samples/VirtoCommerce.NotificationsSampleModule.Tests/VirtoCommerce.NotificationsSampleModule.Tests.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 false @@ -8,15 +8,15 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - - - - - - + + + + + + + + + diff --git a/samples/VirtoCommerce.NotificationsSampleModule.Web/VirtoCommerce.NotificationsSampleModule.Web.csproj b/samples/VirtoCommerce.NotificationsSampleModule.Web/VirtoCommerce.NotificationsSampleModule.Web.csproj index 551aae5c..1ae2f4a0 100644 --- a/samples/VirtoCommerce.NotificationsSampleModule.Web/VirtoCommerce.NotificationsSampleModule.Web.csproj +++ b/samples/VirtoCommerce.NotificationsSampleModule.Web/VirtoCommerce.NotificationsSampleModule.Web.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 1591 Library False @@ -29,7 +29,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -37,4 +37,4 @@ - \ No newline at end of file + diff --git a/src/VirtoCommerce.NotificationsModule.Core/VirtoCommerce.NotificationsModule.Core.csproj b/src/VirtoCommerce.NotificationsModule.Core/VirtoCommerce.NotificationsModule.Core.csproj index a28c25e5..cf073fb2 100644 --- a/src/VirtoCommerce.NotificationsModule.Core/VirtoCommerce.NotificationsModule.Core.csproj +++ b/src/VirtoCommerce.NotificationsModule.Core/VirtoCommerce.NotificationsModule.Core.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 true 1591 True @@ -10,7 +10,7 @@ snupkg - - + + - \ No newline at end of file + diff --git a/src/VirtoCommerce.NotificationsModule.Data.MySql/VirtoCommerce.NotificationsModule.Data.MySql.csproj b/src/VirtoCommerce.NotificationsModule.Data.MySql/VirtoCommerce.NotificationsModule.Data.MySql.csproj index 8c9083b8..9de5531d 100644 --- a/src/VirtoCommerce.NotificationsModule.Data.MySql/VirtoCommerce.NotificationsModule.Data.MySql.csproj +++ b/src/VirtoCommerce.NotificationsModule.Data.MySql/VirtoCommerce.NotificationsModule.Data.MySql.csproj @@ -1,15 +1,16 @@ - net6.0 + net8.0 enable enable + NU5104 - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/VirtoCommerce.NotificationsModule.Data.MySql/VirtoCommerce.NotificationsModule.Data.MySql.csproj.bak b/src/VirtoCommerce.NotificationsModule.Data.MySql/VirtoCommerce.NotificationsModule.Data.MySql.csproj.bak deleted file mode 100644 index bfa4752e..00000000 --- a/src/VirtoCommerce.NotificationsModule.Data.MySql/VirtoCommerce.NotificationsModule.Data.MySql.csproj.bak +++ /dev/null @@ -1,13 +0,0 @@ - - - - net6.0 - enable - enable - - - - - - - diff --git a/src/VirtoCommerce.NotificationsModule.Data.PostgreSql/VirtoCommerce.NotificationsModule.Data.PostgreSql.csproj b/src/VirtoCommerce.NotificationsModule.Data.PostgreSql/VirtoCommerce.NotificationsModule.Data.PostgreSql.csproj index 83fd42c9..09b4d562 100644 --- a/src/VirtoCommerce.NotificationsModule.Data.PostgreSql/VirtoCommerce.NotificationsModule.Data.PostgreSql.csproj +++ b/src/VirtoCommerce.NotificationsModule.Data.PostgreSql/VirtoCommerce.NotificationsModule.Data.PostgreSql.csproj @@ -1,16 +1,16 @@ - net6.0 + net8.0 enable enable - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/src/VirtoCommerce.NotificationsModule.Data.SqlServer/VirtoCommerce.NotificationsModule.Data.SqlServer.csproj b/src/VirtoCommerce.NotificationsModule.Data.SqlServer/VirtoCommerce.NotificationsModule.Data.SqlServer.csproj index cdcebb7d..d6962782 100644 --- a/src/VirtoCommerce.NotificationsModule.Data.SqlServer/VirtoCommerce.NotificationsModule.Data.SqlServer.csproj +++ b/src/VirtoCommerce.NotificationsModule.Data.SqlServer/VirtoCommerce.NotificationsModule.Data.SqlServer.csproj @@ -1,15 +1,15 @@ - net6.0 + net8.0 enable enable - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/VirtoCommerce.NotificationsModule.Data/Repositories/NotificationDbContext.cs b/src/VirtoCommerce.NotificationsModule.Data/Repositories/NotificationDbContext.cs index b6053b1a..c07e18ce 100644 --- a/src/VirtoCommerce.NotificationsModule.Data/Repositories/NotificationDbContext.cs +++ b/src/VirtoCommerce.NotificationsModule.Data/Repositories/NotificationDbContext.cs @@ -2,10 +2,11 @@ using EntityFrameworkCore.Triggers; using Microsoft.EntityFrameworkCore; using VirtoCommerce.NotificationsModule.Data.Model; +using VirtoCommerce.Platform.Data.Infrastructure; namespace VirtoCommerce.NotificationsModule.Data.Repositories { - public class NotificationDbContext : DbContextWithTriggers + public class NotificationDbContext : DbContextBase { public NotificationDbContext(DbContextOptions options) : base(options) diff --git a/src/VirtoCommerce.NotificationsModule.Data/VirtoCommerce.NotificationsModule.Data.csproj b/src/VirtoCommerce.NotificationsModule.Data/VirtoCommerce.NotificationsModule.Data.csproj index 7d3c58ad..4974509b 100644 --- a/src/VirtoCommerce.NotificationsModule.Data/VirtoCommerce.NotificationsModule.Data.csproj +++ b/src/VirtoCommerce.NotificationsModule.Data/VirtoCommerce.NotificationsModule.Data.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 1591 True true @@ -9,13 +9,13 @@ snupkg - - - - - + + + + + - \ No newline at end of file + diff --git a/src/VirtoCommerce.NotificationsModule.LiquidRenderer/VirtoCommerce.NotificationsModule.LiquidRenderer.csproj b/src/VirtoCommerce.NotificationsModule.LiquidRenderer/VirtoCommerce.NotificationsModule.LiquidRenderer.csproj index c62d0cd2..e8da0bf6 100644 --- a/src/VirtoCommerce.NotificationsModule.LiquidRenderer/VirtoCommerce.NotificationsModule.LiquidRenderer.csproj +++ b/src/VirtoCommerce.NotificationsModule.LiquidRenderer/VirtoCommerce.NotificationsModule.LiquidRenderer.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 1591 True true @@ -9,11 +9,11 @@ snupkg - - - + + + - \ No newline at end of file + diff --git a/src/VirtoCommerce.NotificationsModule.SendGrid/VirtoCommerce.NotificationsModule.SendGrid.csproj b/src/VirtoCommerce.NotificationsModule.SendGrid/VirtoCommerce.NotificationsModule.SendGrid.csproj index 85d241c8..51504988 100644 --- a/src/VirtoCommerce.NotificationsModule.SendGrid/VirtoCommerce.NotificationsModule.SendGrid.csproj +++ b/src/VirtoCommerce.NotificationsModule.SendGrid/VirtoCommerce.NotificationsModule.SendGrid.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 1591 True true @@ -9,10 +9,10 @@ snupkg - - + + - \ No newline at end of file + diff --git a/src/VirtoCommerce.NotificationsModule.Smtp/VirtoCommerce.NotificationsModule.Smtp.csproj b/src/VirtoCommerce.NotificationsModule.Smtp/VirtoCommerce.NotificationsModule.Smtp.csproj index 575f4fcd..1446250b 100644 --- a/src/VirtoCommerce.NotificationsModule.Smtp/VirtoCommerce.NotificationsModule.Smtp.csproj +++ b/src/VirtoCommerce.NotificationsModule.Smtp/VirtoCommerce.NotificationsModule.Smtp.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 1591 True true @@ -9,10 +9,10 @@ snupkg - - + + - \ No newline at end of file + diff --git a/src/VirtoCommerce.NotificationsModule.TemplateLoader.FileSystem/VirtoCommerce.NotificationsModule.TemplateLoader.FileSystem.csproj b/src/VirtoCommerce.NotificationsModule.TemplateLoader.FileSystem/VirtoCommerce.NotificationsModule.TemplateLoader.FileSystem.csproj index 7081642d..6e8ef500 100644 --- a/src/VirtoCommerce.NotificationsModule.TemplateLoader.FileSystem/VirtoCommerce.NotificationsModule.TemplateLoader.FileSystem.csproj +++ b/src/VirtoCommerce.NotificationsModule.TemplateLoader.FileSystem/VirtoCommerce.NotificationsModule.TemplateLoader.FileSystem.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 1591 True true @@ -9,7 +9,7 @@ snupkg - + diff --git a/src/VirtoCommerce.NotificationsModule.Twilio/VirtoCommerce.NotificationsModule.Twilio.csproj b/src/VirtoCommerce.NotificationsModule.Twilio/VirtoCommerce.NotificationsModule.Twilio.csproj index b160256b..8346004d 100644 --- a/src/VirtoCommerce.NotificationsModule.Twilio/VirtoCommerce.NotificationsModule.Twilio.csproj +++ b/src/VirtoCommerce.NotificationsModule.Twilio/VirtoCommerce.NotificationsModule.Twilio.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 True true true @@ -8,8 +8,8 @@ snupkg - - + + diff --git a/src/VirtoCommerce.NotificationsModule.Web/VirtoCommerce.NotificationsModule.Web.csproj b/src/VirtoCommerce.NotificationsModule.Web/VirtoCommerce.NotificationsModule.Web.csproj index 8af00c46..a8cc6e70 100644 --- a/src/VirtoCommerce.NotificationsModule.Web/VirtoCommerce.NotificationsModule.Web.csproj +++ b/src/VirtoCommerce.NotificationsModule.Web/VirtoCommerce.NotificationsModule.Web.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 true 1591 Library @@ -32,4 +32,4 @@ - \ No newline at end of file + diff --git a/src/VirtoCommerce.NotificationsModule.Web/module.manifest b/src/VirtoCommerce.NotificationsModule.Web/module.manifest index d801f5bf..c25a2afe 100644 --- a/src/VirtoCommerce.NotificationsModule.Web/module.manifest +++ b/src/VirtoCommerce.NotificationsModule.Web/module.manifest @@ -1,14 +1,12 @@ VirtoCommerce.Notifications - 3.407.0 + 3.800.0 - - 3.429.0 + 3.800.0 - + - Notifications Provides a comprehensive infrastructure for managing and delivering notifications within the Virto Commerce platform. @@ -22,7 +20,7 @@ Modules/$(VirtoCommerce.Notifications)/Content/logoVC.png false - Copyright © 2011-2023 Virto Commerce. All rights reserved + Copyright © 2011-2024 Virto Commerce. All rights reserved notifications VirtoCommerce.NotificationsModule.Web.dll VirtoCommerce.NotificationsModule.Web.Module, VirtoCommerce.NotificationsModule.Web diff --git a/src/VirtoCommerce.NotificationsModule.Web/package-lock.json b/src/VirtoCommerce.NotificationsModule.Web/package-lock.json index 76b90d2b..3f1a0982 100644 --- a/src/VirtoCommerce.NotificationsModule.Web/package-lock.json +++ b/src/VirtoCommerce.NotificationsModule.Web/package-lock.json @@ -12,7 +12,7 @@ "css-loader": "^6.5.1", "mini-css-extract-plugin": "^2.5.1", "webpack": "^5.68.0", - "webpack-cli": "^4.9.2" + "webpack-cli": "^4.10.0" } }, "node_modules/@discoveryjs/json-ext": { @@ -25,9 +25,9 @@ } }, "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", + "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", "dev": true, "dependencies": { "@jridgewell/set-array": "^1.0.1", @@ -39,9 +39,9 @@ } }, "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", - "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", + "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", "dev": true, "engines": { "node": ">=6.0.0" @@ -57,9 +57,9 @@ } }, "node_modules/@jridgewell/source-map": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", - "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz", + "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==", "dev": true, "dependencies": { "@jridgewell/gen-mapping": "^0.3.0", @@ -67,19 +67,19 @@ } }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.14", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", - "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", + "version": "1.4.15", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", "dev": true }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.17", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", - "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", + "version": "0.3.20", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz", + "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==", "dev": true, "dependencies": { - "@jridgewell/resolve-uri": "3.1.0", - "@jridgewell/sourcemap-codec": "1.4.14" + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" } }, "node_modules/@types/eslint": { @@ -103,9 +103,9 @@ } }, "node_modules/@types/estree": { - "version": "0.0.51", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz", - "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", + "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", "dev": true }, "node_modules/@types/glob": { @@ -137,148 +137,148 @@ "dev": true }, "node_modules/@webassemblyjs/ast": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", - "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", + "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==", "dev": true, "dependencies": { - "@webassemblyjs/helper-numbers": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1" + "@webassemblyjs/helper-numbers": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6" } }, "node_modules/@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz", - "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", + "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", "dev": true }, "node_modules/@webassemblyjs/helper-api-error": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz", - "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", + "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", "dev": true }, "node_modules/@webassemblyjs/helper-buffer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", - "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz", + "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==", "dev": true }, "node_modules/@webassemblyjs/helper-numbers": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz", - "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", + "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", "dev": true, "dependencies": { - "@webassemblyjs/floating-point-hex-parser": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", + "@webassemblyjs/floating-point-hex-parser": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", "@xtuc/long": "4.2.2" } }, "node_modules/@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz", - "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", + "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", "dev": true }, "node_modules/@webassemblyjs/helper-wasm-section": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz", - "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz", + "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6" } }, "node_modules/@webassemblyjs/ieee754": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz", - "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", + "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", "dev": true, "dependencies": { "@xtuc/ieee754": "^1.2.0" } }, "node_modules/@webassemblyjs/leb128": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz", - "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", + "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", "dev": true, "dependencies": { "@xtuc/long": "4.2.2" } }, "node_modules/@webassemblyjs/utf8": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", - "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", + "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", "dev": true }, "node_modules/@webassemblyjs/wasm-edit": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz", - "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz", + "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/helper-wasm-section": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-opt": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", - "@webassemblyjs/wast-printer": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/helper-wasm-section": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6", + "@webassemblyjs/wasm-opt": "1.11.6", + "@webassemblyjs/wasm-parser": "1.11.6", + "@webassemblyjs/wast-printer": "1.11.6" } }, "node_modules/@webassemblyjs/wasm-gen": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz", - "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz", + "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" } }, "node_modules/@webassemblyjs/wasm-opt": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz", - "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz", + "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6", + "@webassemblyjs/wasm-parser": "1.11.6" } }, "node_modules/@webassemblyjs/wasm-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz", - "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz", + "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" } }, "node_modules/@webassemblyjs/wast-printer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz", - "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz", + "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/ast": "1.11.6", "@xtuc/long": "4.2.2" } }, @@ -331,9 +331,9 @@ "dev": true }, "node_modules/acorn": { - "version": "8.8.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", - "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", + "version": "8.11.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz", + "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -343,9 +343,9 @@ } }, "node_modules/acorn-import-assertions": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", - "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", + "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", "dev": true, "peerDependencies": { "acorn": "^8" @@ -619,9 +619,9 @@ "dev": true }, "node_modules/enhanced-resolve": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz", - "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", + "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", "dev": true, "dependencies": { "graceful-fs": "^4.2.4", @@ -644,9 +644,9 @@ } }, "node_modules/es-module-lexer": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", - "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.1.tgz", + "integrity": "sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==", "dev": true }, "node_modules/escalade": { @@ -1089,10 +1089,16 @@ } }, "node_modules/nanoid": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -1263,9 +1269,9 @@ } }, "node_modules/postcss": { - "version": "8.4.21", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz", - "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==", + "version": "8.4.32", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.32.tgz", + "integrity": "sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==", "dev": true, "funding": [ { @@ -1275,10 +1281,14 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { - "nanoid": "^3.3.4", + "nanoid": "^3.3.7", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" }, @@ -1493,9 +1503,9 @@ } }, "node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -1614,13 +1624,13 @@ } }, "node_modules/terser": { - "version": "5.16.4", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.4.tgz", - "integrity": "sha512-5yEGuZ3DZradbogeYQ1NaGz7rXVBDWujWlx1PT8efXO6Txn+eWbfKqB2bTDVmFXmePFkoLU6XI8UektMIEA0ug==", + "version": "5.26.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.26.0.tgz", + "integrity": "sha512-dytTGoE2oHgbNV9nTzgBEPaqAWvcJNl66VZ0BkJqlvp71IjO8CxdBx/ykCNb47cLnCmCvRZ6ZR0tLkqvZCdVBQ==", "dev": true, "dependencies": { - "@jridgewell/source-map": "^0.3.2", - "acorn": "^8.5.0", + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.8.2", "commander": "^2.20.0", "source-map-support": "~0.5.20" }, @@ -1632,16 +1642,16 @@ } }, "node_modules/terser-webpack-plugin": { - "version": "5.3.6", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz", - "integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==", + "version": "5.3.9", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz", + "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==", "dev": true, "dependencies": { - "@jridgewell/trace-mapping": "^0.3.14", + "@jridgewell/trace-mapping": "^0.3.17", "jest-worker": "^27.4.5", "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.0", - "terser": "^5.14.1" + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" }, "engines": { "node": ">= 10.13.0" @@ -1697,9 +1707,9 @@ "dev": true }, "node_modules/terser-webpack-plugin/node_modules/schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.8", @@ -1775,22 +1785,22 @@ } }, "node_modules/webpack": { - "version": "5.75.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz", - "integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==", + "version": "5.89.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz", + "integrity": "sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==", "dev": true, "dependencies": { "@types/eslint-scope": "^3.7.3", - "@types/estree": "^0.0.51", - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/wasm-edit": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", "acorn": "^8.7.1", - "acorn-import-assertions": "^1.7.6", + "acorn-import-assertions": "^1.9.0", "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.10.0", - "es-module-lexer": "^0.9.0", + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", "glob-to-regexp": "^0.4.1", @@ -1799,9 +1809,9 @@ "loader-runner": "^4.2.0", "mime-types": "^2.1.27", "neo-async": "^2.6.2", - "schema-utils": "^3.1.0", + "schema-utils": "^3.2.0", "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.1.3", + "terser-webpack-plugin": "^5.3.7", "watchpack": "^2.4.0", "webpack-sources": "^3.2.3" }, @@ -1931,9 +1941,9 @@ "dev": true }, "node_modules/webpack/node_modules/schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.8", diff --git a/tests/VirtoCommerce.NotificationsModule.Tests/UnitTests/NotificationMessageServiceUnitTests.cs b/tests/VirtoCommerce.NotificationsModule.Tests/UnitTests/NotificationMessageServiceUnitTests.cs index 642f3cea..49743b68 100644 --- a/tests/VirtoCommerce.NotificationsModule.Tests/UnitTests/NotificationMessageServiceUnitTests.cs +++ b/tests/VirtoCommerce.NotificationsModule.Tests/UnitTests/NotificationMessageServiceUnitTests.cs @@ -103,7 +103,7 @@ public async Task SaveNotificationMessages_SaveMessage() } [Fact] - public void SaveNotificationMessages_SaveMessageWithValidationError() + public async Task SaveNotificationMessages_SaveMessageWithValidationError() { //Arrange var id = Guid.NewGuid().ToString(); @@ -125,7 +125,7 @@ public void SaveNotificationMessages_SaveMessageWithValidationError() _repositoryMock.Setup(n => n.GetMessagesByIdsAsync(new[] { id })).ReturnsAsync(messageEntities.ToArray()); //Act - Assert.ThrowsAsync(async () => await _notificationMessageService.SaveNotificationMessagesAsync(messages.ToArray())); + await Assert.ThrowsAsync(async () => await _notificationMessageService.SaveNotificationMessagesAsync(messages.ToArray())); } } } diff --git a/tests/VirtoCommerce.NotificationsModule.Tests/UnitTests/NotificationSearchServiceUnitTests.cs b/tests/VirtoCommerce.NotificationsModule.Tests/UnitTests/NotificationSearchServiceUnitTests.cs index 696a2f53..f8e6ec2c 100644 --- a/tests/VirtoCommerce.NotificationsModule.Tests/UnitTests/NotificationSearchServiceUnitTests.cs +++ b/tests/VirtoCommerce.NotificationsModule.Tests/UnitTests/NotificationSearchServiceUnitTests.cs @@ -92,7 +92,7 @@ public async Task GetNotificationByTypeAsync_ReturnNotification() }; var mockNotifications = notifications.AsQueryable().BuildMock(); - _repositoryMock.Setup(r => r.Notifications).Returns(mockNotifications.Object); + _repositoryMock.Setup(r => r.Notifications).Returns(mockNotifications); _notificationRegistrar.RegisterNotification(); var ids = notifications.Select(n => n.Id).ToArray(); _notificationServiceMock.Setup(ns => ns.GetByIdsAsync(ids, null)) @@ -127,7 +127,7 @@ public async Task GetNotificationByAliasAsync_ReturnNotification() _notificationSearchServiceMock.Setup(x => x.SearchNotificationsAsync(criteria4)).ReturnsAsync(new NotificationSearchResult()); var mockNotifications = notifications.AsQueryable().BuildMock(); - _repositoryMock.Setup(r => r.Notifications).Returns(mockNotifications.Object); + _repositoryMock.Setup(r => r.Notifications).Returns(mockNotifications); var ids = notifications.Select(n => n.Id).ToArray(); _notificationServiceMock.Setup(ns => ns.GetByIdsAsync(ids, null)) .ReturnsAsync(notifications.Select(n => n.ToModel(AbstractTypeFactory.TryCreateInstance(n.Type))).ToArray()); @@ -161,7 +161,7 @@ public async Task SearchNotificationsAsync_GetOneItem() searchCriteria.Take = 1; searchCriteria.Skip = 0; var mockNotifications = notifications.AsQueryable().BuildMock(); - _repositoryMock.Setup(r => r.Notifications).Returns(mockNotifications.Object); + _repositoryMock.Setup(r => r.Notifications).Returns(mockNotifications); var ids = notifications.Select(n => n.Id).ToArray(); _notificationServiceMock.Setup(ns => ns.GetByIdsAsync(ids, null)) .ReturnsAsync(notifications.Select(n => n.ToModel(AbstractTypeFactory.TryCreateInstance(n.Type))).ToArray()); @@ -191,7 +191,7 @@ public async Task SearchNotificationsAsync_ContainsActiveNotifications() new EmailNotificationEntity { Type = nameof(RegistrationEmailNotification), Kind = nameof(EmailNotification), Id = Guid.NewGuid().ToString(), IsActive = true } }; var mockNotifications = notificationEntities.AsQueryable().BuildMock(); - _repositoryMock.Setup(r => r.Notifications).Returns(mockNotifications.Object); + _repositoryMock.Setup(r => r.Notifications).Returns(mockNotifications); var notifications = notificationEntities.Select(n => n.ToModel(AbstractTypeFactory.TryCreateInstance(n.Type))).ToArray(); var ids = notificationEntities.Select(n => n.Id).ToArray(); _notificationServiceMock.Setup(ns => ns.GetByIdsAsync(ids, responseGroup)) @@ -221,7 +221,7 @@ public async Task SearchNotificationsAsync_PagingNotifications(int skip, int tak new EmailNotificationEntity { Type = nameof(RegistrationEmailNotification), Kind = nameof(EmailNotification), Id = Guid.NewGuid().ToString(), IsActive = true } }; var mockNotifications = notificationEntities.AsQueryable().BuildMock(); - _repositoryMock.Setup(r => r.Notifications).Returns(mockNotifications.Object); + _repositoryMock.Setup(r => r.Notifications).Returns(mockNotifications); var notifications = notificationEntities.Select(n => n.ToModel(AbstractTypeFactory.TryCreateInstance(n.Type))).ToArray(); _notificationServiceMock.Setup(ns => ns.GetByIdsAsync(It.IsAny(), responseGroup)) .ReturnsAsync(notifications.Where(n => expectedTypes.Contains(n.Type)).ToArray()); @@ -252,7 +252,7 @@ public async Task GetNotificationAsync_GetByTenant() new EmailNotificationEntity { Type = searchType, Kind = nameof(EmailNotification), Id = Guid.NewGuid().ToString(), TenantId = searchTenant.Id, TenantType = searchTenant.Type } }; var mockNotifications = notificationEntities.AsQueryable().BuildMock(); - _repositoryMock.Setup(r => r.Notifications).Returns(mockNotifications.Object); + _repositoryMock.Setup(r => r.Notifications).Returns(mockNotifications); var notifications = notificationEntities.Select(n => n.ToModel(AbstractTypeFactory.TryCreateInstance(n.Type))).ToArray(); _notificationServiceMock.Setup(ns => ns.GetByIdsAsync(It.IsAny(), null)) .ReturnsAsync(notifications.ToArray()); @@ -284,7 +284,7 @@ public async Task GetNotificationAsync_GetByTenant_WithGlobal() new EmailNotificationEntity { Type = searchType, Kind = nameof(EmailNotification), Id = Guid.NewGuid().ToString(), TenantId = "someId", TenantType = "Store" }, }; var mockNotifications = notificationEntities.AsQueryable().BuildMock(); - _repositoryMock.Setup(r => r.Notifications).Returns(mockNotifications.Object); + _repositoryMock.Setup(r => r.Notifications).Returns(mockNotifications); var notifications = notificationEntities.Select(n => n.ToModel(AbstractTypeFactory.TryCreateInstance(n.Type))).ToArray(); _notificationServiceMock.Setup(ns => ns.GetByIdsAsync(It.IsAny(), null)) .ReturnsAsync(notifications.ToArray()); @@ -320,7 +320,7 @@ public async Task SearchNotificationsAsync_GetExtendedNotificationWithBaseType() new EmailNotificationEntity { Type = baseType, Kind = nameof(EmailNotification), Id = Guid.NewGuid().ToString() } }; var mockNotifications = notificationEntities.AsQueryable().BuildMock(); - _repositoryMock.Setup(r => r.Notifications).Returns(mockNotifications.Object); + _repositoryMock.Setup(r => r.Notifications).Returns(mockNotifications); var notifications = notificationEntities.Select(n => n.ToModel(AbstractTypeFactory.TryCreateInstance(n.Type))).ToArray(); _notificationServiceMock.Setup(ns => ns.GetByIdsAsync(It.IsAny(), searchCriteria.ResponseGroup)) .ReturnsAsync(notifications.Where(x => x.Id.EqualsInvariant(sampleNotificationEntity.Id)).ToArray()); diff --git a/tests/VirtoCommerce.NotificationsModule.Tests/VirtoCommerce.NotificationsModule.Tests.csproj b/tests/VirtoCommerce.NotificationsModule.Tests/VirtoCommerce.NotificationsModule.Tests.csproj index e4d1e037..dce28197 100644 --- a/tests/VirtoCommerce.NotificationsModule.Tests/VirtoCommerce.NotificationsModule.Tests.csproj +++ b/tests/VirtoCommerce.NotificationsModule.Tests/VirtoCommerce.NotificationsModule.Tests.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 1591 @@ -8,15 +8,15 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - - - - - - + + + + + + + + + @@ -39,4 +39,4 @@ Always - \ No newline at end of file +