From e4704f7e9606c660209d89b94308a425e7c8f729 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 15 Apr 2021 16:07:59 +0000 Subject: [PATCH 01/30] Merged PR 14006: [internal/release/3.1] Update dependencies from dnceng/internal/dotnet-efcore This pull request updates the following dependencies [marker]: <> (Begin:e908e90a-0c22-4c54-b254-08d79557a113) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - **Subscription**: e908e90a-0c22-4c54-b254-08d79557a113 - **Build**: 20210407.7 - **Date Produced**: 4/7/2021 8:05 PM - **Commit**: 316acfe22bc6d3834e135dc6b8053dc9f560ffc2 - **Branch**: refs/heads/internal/release/3.1 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.EntityFrameworkCore.Tools**: [from 3.1.14 to 3.1.15][1] - **Microsoft.EntityFrameworkCore.SqlServer**: [from 3.1.14 to 3.1.15][1] - **dotnet-ef**: [from 3.1.14 to 3.1.15][1] - **Microsoft.EntityFrameworkCore**: [from 3.1.14 to 3.1.15][1] - **Microsoft.EntityFrameworkCore.InMemory**: [from 3.1.14 to 3.1.15][1] - **Microsoft.EntityFrameworkCore.Relational**: [from 3.1.14 to 3.1.15][1] - **Microsoft.EntityFrameworkCore.Sqlite**: [from 3.1.14 to 3.1.15][1] - **Microsoft.Extensions.Logging**: [from 3.1.14 to 3.1.15][2] - **Microsoft.AspNetCore.Analyzer.Testing**: [from 3.1.14-servicing.21165.9 to 3.1.15-servicing.21207.1][2] - **Microsoft.AspNetCore.BenchmarkRunner.Sources**: [from 3.1.14-servicing.21165.9 to 3.1.15-servicing.21207.1][2] - **Microsoft.Extensions.ActivatorUtilities.Sources**: [from 3.1.14-servicing.21165.9 to 3.1.15-servicing.21207.1][2] - **Microsoft.Extensions.Caching.Abstractions**: [from 3.1.14 to 3.1.15][2] - **Microsoft.Extensions.Caching.Memory**: [from 3.1.14 to 3.1.15][2] - **Microsoft.Extensions.Caching.SqlServer**: [from 3.1.14 to 3.1.15][2] - **Microsoft.Extensions.Caching.StackExchangeRedis**: [from 3.1.14 to 3.1.15][2] - **Microsoft.Extensions.CommandLineUtils.Sources**: [from 3.1.14-servicing.21165.9 to 3.1.15-servicing.21207.1][2] - **Microsoft.Extensions.Configuration.Abstractions**: [from 3.1.14 to 3.1.15][2] - **Microsoft.Extensions.Configuration.AzureKeyVault**: [from 3.1.14 to 3.1.15][2] - **Microsoft.Extensions.Configuration.Binder**: [from 3.1.14 to 3.1.15][2] - **Microsoft.Extensions.Configuration.CommandLine**: [from 3.1.14 to 3.1.15][2] - **Microsoft.Extensions.Configuration.EnvironmentVariables**: [from 3.1.14 to 3.1.15][2] - **Microsoft.Extensions.Configuration.FileExtensions**: [from 3.1.14 to 3.1.15][2] - **Microsoft.Extensions.Configuration.Ini**: [from 3.1.14 to 3.1.15][2] - **Microsoft.Extensions.Configuration.Json**: [from 3.1.14 to 3.1.15][2] - **Microsoft.Extensions.Configuration.KeyPerFile**: [from 3.1.14 to 3.1.15][2] - **Microsoft.Extensions.Configuration.UserSecrets**: [from 3.1.14 to 3.1.15][2] - **Microsoft.Extensions.Configuration.Xml**: [from 3.1.14 to 3.1.15][2] - **Microsoft.Extensions.Configuration**: [from 3.1.14 to 3.1.15][2] - **Microsoft.Extensions.DependencyInjection.Abstractions**: [from 3.1.14 to 3.1.15][2] - **Microsoft.Extensions.DependencyInjection**: [from 3.1.14 to 3.1.15][2] - **Microsoft.Extensions.DiagnosticAdapter**: [fr... --- NuGet.config | 11 +- eng/Version.Details.xml | 264 ++++++++++++++++++++-------------------- eng/Versions.props | 132 ++++++++++---------- 3 files changed, 203 insertions(+), 204 deletions(-) diff --git a/NuGet.config b/NuGet.config index 36d8ba20f4e9..bab3dff1eaaf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,19 +4,16 @@ - - - - + - + @@ -29,7 +26,7 @@ - + @@ -61,6 +58,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b7fb6c1fff4..932a9bba956e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,261 +33,261 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling aec2954c62f9ca32403ef572f8e64b417c6b67e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 986705d060bc4f0dee3c07dda068d09ade582932 + 316acfe22bc6d3834e135dc6b8053dc9f560ffc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 986705d060bc4f0dee3c07dda068d09ade582932 + 316acfe22bc6d3834e135dc6b8053dc9f560ffc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 986705d060bc4f0dee3c07dda068d09ade582932 + 316acfe22bc6d3834e135dc6b8053dc9f560ffc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 986705d060bc4f0dee3c07dda068d09ade582932 + 316acfe22bc6d3834e135dc6b8053dc9f560ffc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 986705d060bc4f0dee3c07dda068d09ade582932 + 316acfe22bc6d3834e135dc6b8053dc9f560ffc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 986705d060bc4f0dee3c07dda068d09ade582932 + 316acfe22bc6d3834e135dc6b8053dc9f560ffc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 986705d060bc4f0dee3c07dda068d09ade582932 + 316acfe22bc6d3834e135dc6b8053dc9f560ffc2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 https://dev.azure.com/dnceng/internal/_git/dotnet-corefx @@ -414,9 +414,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-corefx 6e37696a5420057596d61119614574db9037c652 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 https://github.com/dotnet/arcade @@ -430,9 +430,9 @@ https://github.com/dotnet/arcade 9467b1074927ee3fe98d539d3b72f5686c861958 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 1c79cde92ca66a991b25a5ed9cbd570e289df47e + 894e3747147447536c2b4df570b9a7faf21911c1 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index f485f323a53b..916abbfb7ddc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -101,74 +101,74 @@ 3.2.0 - 3.1.14-servicing.21165.9 - 3.1.14-servicing.21165.9 - 3.1.14-servicing.21165.9 - 3.1.14-servicing.21165.9 - 3.1.14-servicing.21165.9 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14-servicing.21165.9 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14-servicing.21165.9 - 3.1.14 - 3.1.14 - 3.1.14-servicing.21165.9 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14-servicing.21165.9 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14-servicing.21165.9 - 3.1.14 - 3.1.14-servicing.21165.9 - 3.1.14-servicing.21165.9 - 3.1.14 + 3.1.15-servicing.21207.1 + 3.1.15-servicing.21207.1 + 3.1.15-servicing.21207.1 + 3.1.15-servicing.21207.1 + 3.1.15-servicing.21207.1 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15-servicing.21207.1 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15-servicing.21207.1 + 3.1.15 + 3.1.15 + 3.1.15-servicing.21207.1 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15-servicing.21207.1 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15-servicing.21207.1 + 3.1.15 + 3.1.15-servicing.21207.1 + 3.1.15-servicing.21207.1 + 3.1.15 3.1.8-servicing.20420.4 - 3.1.14 + 3.1.15 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 3.1.14 3.1.14 From c5665edc42ef125410933bb3373c56256fcad8c3 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 15 Apr 2021 16:14:01 +0000 Subject: [PATCH 02/30] Merged PR 14041: [internal/release/3.1] Update dependencies from dnceng/internal/dotnet-aspnetcore-tooling This pull request updates the following dependencies [marker]: <> (Begin:7bf32a0c-3505-43af-42b0-08d79559e63d) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - **Subscription**: 7bf32a0c-3505-43af-42b0-08d79559e63d - **Build**: 20210407.8 - **Date Produced**: 4/7/2021 10:59 PM - **Commit**: fd6e7516ef0f4d858b5fa2737791f1e208010a15 - **Branch**: refs/heads/internal/release/3.1 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.AspNetCore.Razor.Language**: [from 3.1.14 to 3.1.15][1] - **Microsoft.CodeAnalysis.Razor**: [from 3.1.14 to 3.1.15][1] - **Microsoft.NET.Sdk.Razor**: [from 3.1.14 to 3.1.15][1] - **Microsoft.AspNetCore.Mvc.Razor.Extensions**: [from 3.1.14 to 3.1.15][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling/branches?baseVersion=GCaec2954&targetVersion=GCfd6e751&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:7bf32a0c-3505-43af-42b0-08d79559e63d) --- NuGet.config | 2 ++ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index bab3dff1eaaf..14694a316b47 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ + @@ -32,6 +33,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 932a9bba956e..25e8bb9843c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,21 +17,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-corefx 620cea9ccf0359993e803c900059932966399584 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - aec2954c62f9ca32403ef572f8e64b417c6b67e8 + fd6e7516ef0f4d858b5fa2737791f1e208010a15 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - aec2954c62f9ca32403ef572f8e64b417c6b67e8 + fd6e7516ef0f4d858b5fa2737791f1e208010a15 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - aec2954c62f9ca32403ef572f8e64b417c6b67e8 + fd6e7516ef0f4d858b5fa2737791f1e208010a15 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - aec2954c62f9ca32403ef572f8e64b417c6b67e8 + fd6e7516ef0f4d858b5fa2737791f1e208010a15 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore diff --git a/eng/Versions.props b/eng/Versions.props index 916abbfb7ddc..cd44cd901ea9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -170,10 +170,10 @@ 3.1.15 3.1.15 - 3.1.14 - 3.1.14 - 3.1.14 - 3.1.14 + 3.1.15 + 3.1.15 + 3.1.15 + 3.1.15 + - + - + @@ -27,7 +28,7 @@ - + @@ -60,6 +61,20 @@ + + + + + + + + + + + + + + @@ -87,6 +102,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 25e8bb9843c7..2adf6170e342 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,259 +35,259 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 316acfe22bc6d3834e135dc6b8053dc9f560ffc2 + f27020308547a24d2b78fad34307d1a4d502f355 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 316acfe22bc6d3834e135dc6b8053dc9f560ffc2 + f27020308547a24d2b78fad34307d1a4d502f355 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 316acfe22bc6d3834e135dc6b8053dc9f560ffc2 + f27020308547a24d2b78fad34307d1a4d502f355 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 316acfe22bc6d3834e135dc6b8053dc9f560ffc2 + f27020308547a24d2b78fad34307d1a4d502f355 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 316acfe22bc6d3834e135dc6b8053dc9f560ffc2 + f27020308547a24d2b78fad34307d1a4d502f355 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 316acfe22bc6d3834e135dc6b8053dc9f560ffc2 + f27020308547a24d2b78fad34307d1a4d502f355 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 316acfe22bc6d3834e135dc6b8053dc9f560ffc2 + f27020308547a24d2b78fad34307d1a4d502f355 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://dev.azure.com/dnceng/internal/_git/dotnet-corefx @@ -390,17 +390,17 @@ Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime. All Runtime.$rid packages should have the same version. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 826c2c2f8f0506c4fdb57ddc71b1dc4af9cb781c + dc339bd0fb2ec082e3afdc0a5ade2066a86d1681 https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 826c2c2f8f0506c4fdb57ddc71b1dc4af9cb781c + dc339bd0fb2ec082e3afdc0a5ade2066a86d1681 @@ -414,9 +414,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-corefx 6e37696a5420057596d61119614574db9037c652 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://github.com/dotnet/arcade @@ -430,9 +430,9 @@ https://github.com/dotnet/arcade 9467b1074927ee3fe98d539d3b72f5686c861958 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 894e3747147447536c2b4df570b9a7faf21911c1 + 194782ed2ccc8f5103e741c8421a60c3618c8fed https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index cd44cd901ea9..33ae694937e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,9 +68,9 @@ 3.4.1-beta4-20127-10 3.1.6 - 3.1.14-servicing.21165.2 + 3.1.15-servicing.21214.3 3.1.0 - 3.1.14 + 3.1.15 2.1.0 1.1.1 @@ -101,16 +101,16 @@ 3.2.0 - 3.1.15-servicing.21207.1 - 3.1.15-servicing.21207.1 - 3.1.15-servicing.21207.1 - 3.1.15-servicing.21207.1 - 3.1.15-servicing.21207.1 + 3.1.15-servicing.21214.5 + 3.1.15-servicing.21214.5 + 3.1.15-servicing.21214.5 + 3.1.15-servicing.21214.5 + 3.1.15-servicing.21214.5 3.1.15 3.1.15 3.1.15 3.1.15 - 3.1.15-servicing.21207.1 + 3.1.15-servicing.21214.5 3.1.15 3.1.15 3.1.15 @@ -133,10 +133,10 @@ 3.1.15 3.1.15 3.1.15 - 3.1.15-servicing.21207.1 + 3.1.15-servicing.21214.5 3.1.15 3.1.15 - 3.1.15-servicing.21207.1 + 3.1.15-servicing.21214.5 3.1.15 3.1.15 3.1.15 @@ -148,16 +148,16 @@ 3.1.15 3.1.15 3.1.15 - 3.1.15-servicing.21207.1 + 3.1.15-servicing.21214.5 3.1.15 3.1.15 3.1.15 3.1.15 3.1.15 - 3.1.15-servicing.21207.1 + 3.1.15-servicing.21214.5 3.1.15 - 3.1.15-servicing.21207.1 - 3.1.15-servicing.21207.1 + 3.1.15-servicing.21214.5 + 3.1.15-servicing.21214.5 3.1.15 3.1.8-servicing.20420.4 3.1.15 From 8ca3954ca335343ce6dd1d14d8d1c6c3369710b7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 15 Apr 2021 23:10:49 +0000 Subject: [PATCH 04/30] [internal/release/3.1] Update dependencies from dnceng/internal/dotnet-aspnetcore-tooling - Fix tests - Fixup nuget config - Merge remote-tracking branch 'origin/internal/release/3.1' into darc-internal/release/3.1-abb7ce07-c2cf-48b4-83cf-58ca4dbabd3d --- NuGet.config | 104 +----------------- eng/Version.Details.xml | 8 +- ...ts.WebAssembly.Authentication.Tests.csproj | 1 + ...etCore.Components.WebAssembly.Tests.csproj | 1 + 4 files changed, 9 insertions(+), 105 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8976514f217b..a814104b796e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -29,116 +29,18 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2adf6170e342..de0c8dbdc993 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,19 +19,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - fd6e7516ef0f4d858b5fa2737791f1e208010a15 + b4f2d7437db4b5f36375cfcf1de316e3e42fcee6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - fd6e7516ef0f4d858b5fa2737791f1e208010a15 + b4f2d7437db4b5f36375cfcf1de316e3e42fcee6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - fd6e7516ef0f4d858b5fa2737791f1e208010a15 + b4f2d7437db4b5f36375cfcf1de316e3e42fcee6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - fd6e7516ef0f4d858b5fa2737791f1e208010a15 + b4f2d7437db4b5f36375cfcf1de316e3e42fcee6 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore diff --git a/src/Components/WebAssembly/WebAssembly.Authentication/test/Microsoft.AspNetCore.Components.WebAssembly.Authentication.Tests.csproj b/src/Components/WebAssembly/WebAssembly.Authentication/test/Microsoft.AspNetCore.Components.WebAssembly.Authentication.Tests.csproj index f6a0faf5e390..3ef6668f3ed4 100644 --- a/src/Components/WebAssembly/WebAssembly.Authentication/test/Microsoft.AspNetCore.Components.WebAssembly.Authentication.Tests.csproj +++ b/src/Components/WebAssembly/WebAssembly.Authentication/test/Microsoft.AspNetCore.Components.WebAssembly.Authentication.Tests.csproj @@ -11,6 +11,7 @@ + diff --git a/src/Components/WebAssembly/WebAssembly/test/Microsoft.AspNetCore.Components.WebAssembly.Tests.csproj b/src/Components/WebAssembly/WebAssembly/test/Microsoft.AspNetCore.Components.WebAssembly.Tests.csproj index 6450d01d8aa0..885b11d9243d 100644 --- a/src/Components/WebAssembly/WebAssembly/test/Microsoft.AspNetCore.Components.WebAssembly.Tests.csproj +++ b/src/Components/WebAssembly/WebAssembly/test/Microsoft.AspNetCore.Components.WebAssembly.Tests.csproj @@ -9,6 +9,7 @@ + From 68e6e227da6fb5dd71c7a60c671c546e680bf145 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 11 May 2021 10:09:53 -0700 Subject: [PATCH 05/30] Internal->public code merge, update baseline & SDK --- eng/Baseline.Designer.props | 430 ++++++++++++++++++------------------ eng/Baseline.xml | 148 ++++++------- eng/Versions.props | 2 +- global.json | 4 +- 4 files changed, 292 insertions(+), 292 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index c3e7fab57d0a..56951b62992c 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,7 +2,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 3.1.14 + 3.1.15 @@ -14,7 +14,7 @@ - 3.1.14 + 3.1.15 @@ -25,83 +25,83 @@ - 3.1.14 + 3.1.15 - - - + + + - + - 3.1.14 + 3.1.15 - 3.1.14 + 3.1.15 - - + + - 3.1.14 + 3.1.15 - - + + - 3.1.14 + 3.1.15 - 3.1.14 + 3.1.15 - 3.1.14 + 3.1.15 - 3.1.14 + 3.1.15 - 3.1.14 + 3.1.15 - 3.1.14 + 3.1.15 - + - 3.1.14 + 3.1.15 - 3.1.14 + 3.1.15 - 3.1.14 + 3.1.15 @@ -109,97 +109,97 @@ - 3.1.14 + 3.1.15 - - - + + + - - - + + + - 3.1.14 + 3.1.15 - - + + - 3.1.14 + 3.1.15 - + - 3.1.14 + 3.1.15 - + - 3.1.14 + 3.1.15 - - - + + + - - - + + + - 3.1.14 + 3.1.15 - 3.1.14 + 3.1.15 - - + + - - + + - 3.1.14 + 3.1.15 - + - + - 3.1.14 + 3.1.15 - - - - + + + + - - - - + + + + @@ -244,215 +244,215 @@ - 3.1.14 + 3.1.15 - - + + - 3.1.14 + 3.1.15 - + - + - + - 3.1.14 + 3.1.15 - 3.1.14 + 3.1.15 - + - + - + - 3.1.14 + 3.1.15 - - - - - - + + + + + + - - - - - - + + + + + + - 3.1.14 + 3.1.15 - 3.1.14 + 3.1.15 - + - 3.1.14 + 3.1.15 - + - 3.1.14 + 3.1.15 - - + + - 3.1.14 + 3.1.15 - - + + - - + + - 3.1.14 + 3.1.15 - + - 3.1.14 + 3.1.15 - + - 3.1.14 + 3.1.15 - - + + - 3.1.14 + 3.1.15 - 3.1.14 + 3.1.15 - - - + + + - - - + + + - 3.1.14 + 3.1.15 - + - + - 3.1.14 + 3.1.15 - + - + - 3.1.14 + 3.1.15 - - + + - - + + - 3.1.14 + 3.1.15 - - - + + + - 3.1.14 + 3.1.15 - - + + - 3.1.14 + 3.1.15 @@ -460,236 +460,236 @@ - 3.1.14 + 3.1.15 - 3.1.14 + 3.1.15 - + - 3.1.14 + 3.1.15 - + - 3.1.14 + 3.1.15 - - + + - 3.1.14 + 3.1.15 - + - + - 3.1.14 + 3.1.15 - + - 3.1.14 + 3.1.15 - 3.1.14 + 3.1.15 - + - - + + - 3.1.14 + 3.1.15 - - + + - 3.1.14 + 3.1.15 - - + + - - + + - - - - + + + + - 3.1.14 + 3.1.15 - - + + - - + + - 3.1.14 + 3.1.15 - + - + - 3.1.14 + 3.1.15 - + - 3.1.14 + 3.1.15 - + - 3.1.14 + 3.1.15 - - - - + + + + - 3.1.14 + 3.1.15 - + - 3.1.14 + 3.1.15 - + - 3.1.14 + 3.1.15 - - + + - 3.1.14 + 3.1.15 - 3.1.14 + 3.1.15 - 3.1.14 + 3.1.15 - 3.1.14 + 3.1.15 - 3.1.14 + 3.1.15 - 3.1.14 + 3.1.15 - 3.1.14 + 3.1.15 - 3.1.14 + 3.1.15 - 3.1.14 + 3.1.15 - - - + + + - 3.1.14 + 3.1.15 - - - + + + - - - + + + - 3.1.14 + 3.1.15 - - - + + + - - - + + + \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index a9beaf42a68b..95403599b65b 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,87 +4,87 @@ This file contains a list of all the packages and their versions which were rele Update this list when preparing for a new patch. --> - + - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/Versions.props b/eng/Versions.props index f51e2b4181ac..2ebefb437105 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ 3 1 16 - false + true 0 3 2 diff --git a/global.json b/global.json index 966c76e39040..4f97bd355f95 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "3.1.114" + "version": "3.1.115" }, "tools": { - "dotnet": "3.1.114", + "dotnet": "3.1.115", "runtimes": { "dotnet/x64": [ "$(MicrosoftNETCoreAppInternalPackageVersion)" From 710361cd01c00d96d1d905a65486838162958ed7 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 11 May 2021 17:04:20 -0700 Subject: [PATCH 06/30] Branch merge Update SDK Update manifests and baselines --- build/dependencies.props | 6 +- eng/Baseline.Designer.props | 2 +- eng/Baseline.xml | 2 +- korebuild-lock.txt | 4 +- .../ArchiveBaseline.2.1.28.txt | 202 ++++++++++++++++++ .../ArchiveBaseline.2.1.28.txt | 194 +++++++++++++++++ version.props | 2 +- 7 files changed, 404 insertions(+), 8 deletions(-) create mode 100644 src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.28.txt create mode 100644 src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.28.txt diff --git a/build/dependencies.props b/build/dependencies.props index da2e0d05d868..08d5fc0d0fe0 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -2,8 +2,8 @@ - 2.1.27 - 2.1.27 + 2.1.28 + 2.1.28 @@ -15,7 +15,7 @@ $(KoreBuildVersion) $(KoreBuildVersion) - 2.1.7-build-20210413.1 + 2.1.7-build-20210511.1 diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 5d500dbf9c39..ae1e9f3101ac 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,7 +2,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.1.27 + 2.1.28 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 3727afbd89df..c6baaa08f4fb 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,7 +4,7 @@ This file contains a list of all the packages and their versions which were rele build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. --> - + diff --git a/korebuild-lock.txt b/korebuild-lock.txt index fa8df591ab4b..cfdef1d1990b 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.7-build-20210413.1 -commithash:41a55f8d844c4be8c4afa5f70f72b80067f0d113 +version:2.1.7-build-20210511.1 +commithash:906456f33fe18b375d5780d44872092334ccfa17 diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.28.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.28.txt new file mode 100644 index 000000000000..4edb4dccff48 --- /dev/null +++ b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.28.txt @@ -0,0 +1,202 @@ +microsoft.visualstudio.web.codegeneration.contracts\2.1.10\.nupkg.metadata +microsoft.visualstudio.web.codegeneration.contracts\2.1.10\.signature.p7s +microsoft.visualstudio.web.codegeneration.contracts\2.1.10\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.Contracts.dll +microsoft.visualstudio.web.codegeneration.contracts\2.1.10\microsoft.visualstudio.web.codegeneration.contracts.2.1.10.nupkg +microsoft.visualstudio.web.codegeneration.contracts\2.1.10\microsoft.visualstudio.web.codegeneration.contracts.2.1.10.nupkg.sha512 +microsoft.visualstudio.web.codegeneration.contracts\2.1.10\microsoft.visualstudio.web.codegeneration.contracts.nuspec +microsoft.visualstudio.web.codegeneration.core\2.1.10\.nupkg.metadata +microsoft.visualstudio.web.codegeneration.core\2.1.10\.signature.p7s +microsoft.visualstudio.web.codegeneration.core\2.1.10\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.Core.dll +microsoft.visualstudio.web.codegeneration.core\2.1.10\microsoft.visualstudio.web.codegeneration.core.2.1.10.nupkg +microsoft.visualstudio.web.codegeneration.core\2.1.10\microsoft.visualstudio.web.codegeneration.core.2.1.10.nupkg.sha512 +microsoft.visualstudio.web.codegeneration.core\2.1.10\microsoft.visualstudio.web.codegeneration.core.nuspec +microsoft.visualstudio.web.codegeneration.design\2.1.10\.nupkg.metadata +microsoft.visualstudio.web.codegeneration.design\2.1.10\.signature.p7s +microsoft.visualstudio.web.codegeneration.design\2.1.10\lib\net461\dotnet-aspnet-codegenerator-design.exe +microsoft.visualstudio.web.codegeneration.design\2.1.10\lib\netstandard2.0\dotnet-aspnet-codegenerator-design.dll +microsoft.visualstudio.web.codegeneration.design\2.1.10\microsoft.visualstudio.web.codegeneration.design.2.1.10.nupkg +microsoft.visualstudio.web.codegeneration.design\2.1.10\microsoft.visualstudio.web.codegeneration.design.2.1.10.nupkg.sha512 +microsoft.visualstudio.web.codegeneration.design\2.1.10\microsoft.visualstudio.web.codegeneration.design.nuspec +microsoft.visualstudio.web.codegeneration.design\2.1.10\runtimes\win7-x64\lib\net461\dotnet-aspnet-codegenerator-design.exe +microsoft.visualstudio.web.codegeneration.design\2.1.10\runtimes\win7-x86\lib\net461\dotnet-aspnet-codegenerator-design.exe +microsoft.visualstudio.web.codegeneration.design\2.1.10\runtimes\win-arm\lib\net461\dotnet-aspnet-codegenerator-design.exe +microsoft.visualstudio.web.codegeneration.design\2.1.10\runtimes\win-arm64\lib\net461\dotnet-aspnet-codegenerator-design.exe +microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.10\.nupkg.metadata +microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.10\.signature.p7s +microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.10\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore.dll +microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.10\microsoft.visualstudio.web.codegeneration.entityframeworkcore.2.1.10.nupkg +microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.10\microsoft.visualstudio.web.codegeneration.entityframeworkcore.2.1.10.nupkg.sha512 +microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.10\microsoft.visualstudio.web.codegeneration.entityframeworkcore.nuspec +microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.10\Templates\DbContext\NewLocalDbContext.cshtml +microsoft.visualstudio.web.codegeneration.templating\2.1.10\.nupkg.metadata +microsoft.visualstudio.web.codegeneration.templating\2.1.10\.signature.p7s +microsoft.visualstudio.web.codegeneration.templating\2.1.10\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.Templating.dll +microsoft.visualstudio.web.codegeneration.templating\2.1.10\microsoft.visualstudio.web.codegeneration.templating.2.1.10.nupkg +microsoft.visualstudio.web.codegeneration.templating\2.1.10\microsoft.visualstudio.web.codegeneration.templating.2.1.10.nupkg.sha512 +microsoft.visualstudio.web.codegeneration.templating\2.1.10\microsoft.visualstudio.web.codegeneration.templating.nuspec +microsoft.visualstudio.web.codegeneration.utils\2.1.10\.nupkg.metadata +microsoft.visualstudio.web.codegeneration.utils\2.1.10\.signature.p7s +microsoft.visualstudio.web.codegeneration.utils\2.1.10\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.Utils.dll +microsoft.visualstudio.web.codegeneration.utils\2.1.10\microsoft.visualstudio.web.codegeneration.utils.2.1.10.nupkg +microsoft.visualstudio.web.codegeneration.utils\2.1.10\microsoft.visualstudio.web.codegeneration.utils.2.1.10.nupkg.sha512 +microsoft.visualstudio.web.codegeneration.utils\2.1.10\microsoft.visualstudio.web.codegeneration.utils.nuspec +microsoft.visualstudio.web.codegeneration\2.1.10\.nupkg.metadata +microsoft.visualstudio.web.codegeneration\2.1.10\.signature.p7s +microsoft.visualstudio.web.codegeneration\2.1.10\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.dll +microsoft.visualstudio.web.codegeneration\2.1.10\microsoft.visualstudio.web.codegeneration.2.1.10.nupkg +microsoft.visualstudio.web.codegeneration\2.1.10\microsoft.visualstudio.web.codegeneration.2.1.10.nupkg.sha512 +microsoft.visualstudio.web.codegeneration\2.1.10\microsoft.visualstudio.web.codegeneration.nuspec +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\.nupkg.metadata +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\.signature.p7s +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Generators\ParameterDefinitions\area.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Generators\ParameterDefinitions\controller.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Generators\ParameterDefinitions\identity.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Generators\ParameterDefinitions\razorpage.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Generators\ParameterDefinitions\view.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\lib\netstandard2.0\identitygeneratorfilesconfig.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGenerators.Mvc.dll +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\microsoft.visualstudio.web.codegenerators.mvc.2.1.10.nupkg +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\microsoft.visualstudio.web.codegenerators.mvc.2.1.10.nupkg.sha512 +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\microsoft.visualstudio.web.codegenerators.mvc.nuspec +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\ControllerGenerator\ApiControllerWithActions.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\ControllerGenerator\ApiControllerWithContext.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\ControllerGenerator\ApiEmptyController.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\ControllerGenerator\ControllerWithActions.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\ControllerGenerator\EmptyController.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\ControllerGenerator\MvcControllerWithContext.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\_LoginPartial.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Data\ApplicationDbContext.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Data\ApplicationUser.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\IdentityHostingStartup.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\_Layout.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\_ValidationScriptsPartial.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\_ViewImports.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\_ViewStart.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account._ViewImports.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.AccessDenied.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.AccessDenied.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.ConfirmEmail.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.ConfirmEmail.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.ExternalLogin.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.ExternalLogin.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.ForgotPassword.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.ForgotPassword.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.ForgotPasswordConfirmation.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.ForgotPasswordConfirmation.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.Lockout.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.Lockout.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.Login.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.Login.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.LoginWith2fa.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.LoginWith2fa.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.LoginWithRecoveryCode.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.LoginWithRecoveryCode.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.Logout.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.Logout.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.Register.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.Register.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.ResetPassword.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.ResetPassword.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.ResetPasswordConfirmation.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.ResetPasswordConfirmation.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage._Layout.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage._ManageNav.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage._StatusMessage.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage._ViewImports.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.ChangePassword.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.ChangePassword.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.DeletePersonalData.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.DeletePersonalData.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.Disable2fa.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.Disable2fa.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.DownloadPersonalData.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.DownloadPersonalData.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.EnableAuthenticator.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.EnableAuthenticator.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.ExternalLogins.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.ExternalLogins.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.GenerateRecoveryCodes.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.GenerateRecoveryCodes.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.Index.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.Index.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.ManageNavPages.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.PersonalData.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.PersonalData.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.ResetAuthenticator.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.ResetAuthenticator.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.SetPassword.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.SetPassword.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.ShowRecoveryCodes.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.ShowRecoveryCodes.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.TwoFactorAuthentication.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.TwoFactorAuthentication.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Error.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Error.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\ScaffoldingReadme.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\SupportPages._CookieConsentPartial.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\SupportPages._ViewImports.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\SupportPages._ViewStart.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\css\site.css +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\css\site.min.css +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\favicon.ico +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\images\banner1.svg +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\images\banner2.svg +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\images\banner3.svg +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\js\site.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\js\site.min.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap.css +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap.css.map +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap.min.css +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap.min.css.map +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap-theme.css +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap-theme.css.map +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap-theme.min.css +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap-theme.min.css.map +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\fonts\glyphicons-halflings-regular.eot +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\fonts\glyphicons-halflings-regular.svg +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\fonts\glyphicons-halflings-regular.ttf +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\fonts\glyphicons-halflings-regular.woff +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\fonts\glyphicons-halflings-regular.woff2 +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\js\bootstrap.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\js\bootstrap.min.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\js\npm.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\LICENSE +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\jquery\.bower.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\jquery\dist\jquery.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\jquery\dist\jquery.min.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\jquery\dist\jquery.min.map +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\jquery\LICENSE.txt +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\jquery-validation\.bower.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\jquery-validation\dist\additional-methods.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\jquery-validation\dist\additional-methods.min.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\jquery-validation\dist\jquery.validate.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\jquery-validation\dist\jquery.validate.min.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\jquery-validation\LICENSE.md +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\jquery-validation-unobtrusive\.bower.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\jquery-validation-unobtrusive\jquery.validate.unobtrusive.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\jquery-validation-unobtrusive\jquery.validate.unobtrusive.min.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\jquery-validation-unobtrusive\LICENSE.txt +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\MvcLayout\_Layout.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\MvcLayout\Error.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\RazorPageGenerator\_ValidationScriptsPartial.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\RazorPageGenerator\Create.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\RazorPageGenerator\CreatePageModel.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\RazorPageGenerator\Delete.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\RazorPageGenerator\DeletePageModel.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\RazorPageGenerator\Details.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\RazorPageGenerator\DetailsPageModel.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\RazorPageGenerator\Edit.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\RazorPageGenerator\EditPageModel.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\RazorPageGenerator\Empty.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\RazorPageGenerator\EmptyPageModel.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\RazorPageGenerator\List.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\RazorPageGenerator\ListPageModel.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Startup\ReadMe.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Startup\Startup.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\ViewGenerator\_ValidationScriptsPartial.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\ViewGenerator\Create.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\ViewGenerator\Delete.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\ViewGenerator\Details.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\ViewGenerator\Edit.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\ViewGenerator\Empty.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\ViewGenerator\List.cshtml diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.28.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.28.txt new file mode 100644 index 000000000000..a4c42599b96b --- /dev/null +++ b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.28.txt @@ -0,0 +1,194 @@ +microsoft.visualstudio.web.codegeneration.contracts\2.1.10\.nupkg.metadata +microsoft.visualstudio.web.codegeneration.contracts\2.1.10\.signature.p7s +microsoft.visualstudio.web.codegeneration.contracts\2.1.10\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.Contracts.dll +microsoft.visualstudio.web.codegeneration.contracts\2.1.10\microsoft.visualstudio.web.codegeneration.contracts.2.1.10.nupkg.sha512 +microsoft.visualstudio.web.codegeneration.contracts\2.1.10\microsoft.visualstudio.web.codegeneration.contracts.nuspec +microsoft.visualstudio.web.codegeneration.core\2.1.10\.nupkg.metadata +microsoft.visualstudio.web.codegeneration.core\2.1.10\.signature.p7s +microsoft.visualstudio.web.codegeneration.core\2.1.10\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.Core.dll +microsoft.visualstudio.web.codegeneration.core\2.1.10\microsoft.visualstudio.web.codegeneration.core.2.1.10.nupkg.sha512 +microsoft.visualstudio.web.codegeneration.core\2.1.10\microsoft.visualstudio.web.codegeneration.core.nuspec +microsoft.visualstudio.web.codegeneration.design\2.1.10\.nupkg.metadata +microsoft.visualstudio.web.codegeneration.design\2.1.10\.signature.p7s +microsoft.visualstudio.web.codegeneration.design\2.1.10\lib\net461\dotnet-aspnet-codegenerator-design.exe +microsoft.visualstudio.web.codegeneration.design\2.1.10\lib\netstandard2.0\dotnet-aspnet-codegenerator-design.dll +microsoft.visualstudio.web.codegeneration.design\2.1.10\microsoft.visualstudio.web.codegeneration.design.2.1.10.nupkg.sha512 +microsoft.visualstudio.web.codegeneration.design\2.1.10\microsoft.visualstudio.web.codegeneration.design.nuspec +microsoft.visualstudio.web.codegeneration.design\2.1.10\runtimes\win7-x64\lib\net461\dotnet-aspnet-codegenerator-design.exe +microsoft.visualstudio.web.codegeneration.design\2.1.10\runtimes\win7-x86\lib\net461\dotnet-aspnet-codegenerator-design.exe +microsoft.visualstudio.web.codegeneration.design\2.1.10\runtimes\win-arm\lib\net461\dotnet-aspnet-codegenerator-design.exe +microsoft.visualstudio.web.codegeneration.design\2.1.10\runtimes\win-arm64\lib\net461\dotnet-aspnet-codegenerator-design.exe +microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.10\.nupkg.metadata +microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.10\.signature.p7s +microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.10\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore.dll +microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.10\microsoft.visualstudio.web.codegeneration.entityframeworkcore.2.1.10.nupkg.sha512 +microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.10\microsoft.visualstudio.web.codegeneration.entityframeworkcore.nuspec +microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.10\Templates\DbContext\NewLocalDbContext.cshtml +microsoft.visualstudio.web.codegeneration.templating\2.1.10\.nupkg.metadata +microsoft.visualstudio.web.codegeneration.templating\2.1.10\.signature.p7s +microsoft.visualstudio.web.codegeneration.templating\2.1.10\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.Templating.dll +microsoft.visualstudio.web.codegeneration.templating\2.1.10\microsoft.visualstudio.web.codegeneration.templating.2.1.10.nupkg.sha512 +microsoft.visualstudio.web.codegeneration.templating\2.1.10\microsoft.visualstudio.web.codegeneration.templating.nuspec +microsoft.visualstudio.web.codegeneration.utils\2.1.10\.nupkg.metadata +microsoft.visualstudio.web.codegeneration.utils\2.1.10\.signature.p7s +microsoft.visualstudio.web.codegeneration.utils\2.1.10\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.Utils.dll +microsoft.visualstudio.web.codegeneration.utils\2.1.10\microsoft.visualstudio.web.codegeneration.utils.2.1.10.nupkg.sha512 +microsoft.visualstudio.web.codegeneration.utils\2.1.10\microsoft.visualstudio.web.codegeneration.utils.nuspec +microsoft.visualstudio.web.codegeneration\2.1.10\.nupkg.metadata +microsoft.visualstudio.web.codegeneration\2.1.10\.signature.p7s +microsoft.visualstudio.web.codegeneration\2.1.10\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.dll +microsoft.visualstudio.web.codegeneration\2.1.10\microsoft.visualstudio.web.codegeneration.2.1.10.nupkg.sha512 +microsoft.visualstudio.web.codegeneration\2.1.10\microsoft.visualstudio.web.codegeneration.nuspec +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\.nupkg.metadata +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\.signature.p7s +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Generators\ParameterDefinitions\area.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Generators\ParameterDefinitions\controller.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Generators\ParameterDefinitions\identity.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Generators\ParameterDefinitions\razorpage.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Generators\ParameterDefinitions\view.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\lib\netstandard2.0\identitygeneratorfilesconfig.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGenerators.Mvc.dll +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\microsoft.visualstudio.web.codegenerators.mvc.2.1.10.nupkg.sha512 +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\microsoft.visualstudio.web.codegenerators.mvc.nuspec +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\ControllerGenerator\ApiControllerWithActions.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\ControllerGenerator\ApiControllerWithContext.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\ControllerGenerator\ApiEmptyController.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\ControllerGenerator\ControllerWithActions.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\ControllerGenerator\EmptyController.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\ControllerGenerator\MvcControllerWithContext.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\_LoginPartial.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Data\ApplicationDbContext.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Data\ApplicationUser.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\IdentityHostingStartup.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\_Layout.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\_ValidationScriptsPartial.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\_ViewImports.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\_ViewStart.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account._ViewImports.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.AccessDenied.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.AccessDenied.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.ConfirmEmail.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.ConfirmEmail.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.ExternalLogin.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.ExternalLogin.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.ForgotPassword.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.ForgotPassword.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.ForgotPasswordConfirmation.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.ForgotPasswordConfirmation.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.Lockout.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.Lockout.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.Login.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.Login.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.LoginWith2fa.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.LoginWith2fa.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.LoginWithRecoveryCode.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.LoginWithRecoveryCode.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.Logout.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.Logout.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.Register.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.Register.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.ResetPassword.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.ResetPassword.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.ResetPasswordConfirmation.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Account.ResetPasswordConfirmation.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage._Layout.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage._ManageNav.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage._StatusMessage.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage._ViewImports.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.ChangePassword.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.ChangePassword.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.DeletePersonalData.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.DeletePersonalData.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.Disable2fa.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.Disable2fa.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.DownloadPersonalData.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.DownloadPersonalData.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.EnableAuthenticator.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.EnableAuthenticator.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.ExternalLogins.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.ExternalLogins.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.GenerateRecoveryCodes.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.GenerateRecoveryCodes.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.Index.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.Index.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.ManageNavPages.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.PersonalData.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.PersonalData.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.ResetAuthenticator.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.ResetAuthenticator.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.SetPassword.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.SetPassword.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.ShowRecoveryCodes.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.ShowRecoveryCodes.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.TwoFactorAuthentication.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Account\Manage\Account.Manage.TwoFactorAuthentication.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Error.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\Pages\Error.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\ScaffoldingReadme.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\SupportPages._CookieConsentPartial.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\SupportPages._ViewImports.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\SupportPages._ViewStart.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\css\site.css +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\css\site.min.css +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\favicon.ico +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\images\banner1.svg +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\images\banner2.svg +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\images\banner3.svg +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\js\site.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\js\site.min.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap.css +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap.css.map +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap.min.css +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap.min.css.map +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap-theme.css +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap-theme.css.map +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap-theme.min.css +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap-theme.min.css.map +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\fonts\glyphicons-halflings-regular.eot +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\fonts\glyphicons-halflings-regular.svg +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\fonts\glyphicons-halflings-regular.ttf +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\fonts\glyphicons-halflings-regular.woff +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\fonts\glyphicons-halflings-regular.woff2 +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\js\bootstrap.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\js\bootstrap.min.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\dist\js\npm.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\bootstrap\LICENSE +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\jquery\.bower.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\jquery\dist\jquery.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\jquery\dist\jquery.min.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\jquery\dist\jquery.min.map +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\jquery\LICENSE.txt +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\jquery-validation\.bower.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\jquery-validation\dist\additional-methods.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\jquery-validation\dist\additional-methods.min.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\jquery-validation\dist\jquery.validate.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\jquery-validation\dist\jquery.validate.min.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\jquery-validation\LICENSE.md +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\jquery-validation-unobtrusive\.bower.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\jquery-validation-unobtrusive\jquery.validate.unobtrusive.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\jquery-validation-unobtrusive\jquery.validate.unobtrusive.min.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Identity\wwwroot\lib\jquery-validation-unobtrusive\LICENSE.txt +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\MvcLayout\_Layout.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\MvcLayout\Error.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\RazorPageGenerator\_ValidationScriptsPartial.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\RazorPageGenerator\Create.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\RazorPageGenerator\CreatePageModel.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\RazorPageGenerator\Delete.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\RazorPageGenerator\DeletePageModel.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\RazorPageGenerator\Details.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\RazorPageGenerator\DetailsPageModel.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\RazorPageGenerator\Edit.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\RazorPageGenerator\EditPageModel.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\RazorPageGenerator\Empty.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\RazorPageGenerator\EmptyPageModel.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\RazorPageGenerator\List.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\RazorPageGenerator\ListPageModel.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Startup\ReadMe.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\Startup\Startup.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\ViewGenerator\_ValidationScriptsPartial.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\ViewGenerator\Create.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\ViewGenerator\Delete.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\ViewGenerator\Details.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\ViewGenerator\Edit.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\ViewGenerator\Empty.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.10\Templates\ViewGenerator\List.cshtml diff --git a/version.props b/version.props index 83617cc5f091..3ab33a46b0d3 100644 --- a/version.props +++ b/version.props @@ -3,7 +3,7 @@ 2 1 29 - false + true servicing Servicing From 990e060885d6bf845c5cb7a6537d0fba5e969834 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 12 May 2021 02:36:36 +0000 Subject: [PATCH 07/30] Sync shared code from runtime (#32573) --- .../tools/CodeGenerator/CodeGenerator.csproj | 1 + .../Http2/Hpack/H2StaticTable.Http2.cs | 100 ++++++++++++ .../runtime/Http2/Hpack/H2StaticTable.cs | 95 +---------- .../Http3/QPack/H3StaticTable.Http3.cs | 154 ++++++++++++++++++ .../runtime/Http3/QPack/H3StaticTable.cs | 148 +---------------- 5 files changed, 257 insertions(+), 241 deletions(-) create mode 100644 src/Shared/runtime/Http2/Hpack/H2StaticTable.Http2.cs create mode 100644 src/Shared/runtime/Http3/QPack/H3StaticTable.Http3.cs diff --git a/src/Servers/Kestrel/tools/CodeGenerator/CodeGenerator.csproj b/src/Servers/Kestrel/tools/CodeGenerator/CodeGenerator.csproj index 211523c8df91..ebfe9f77d71f 100644 --- a/src/Servers/Kestrel/tools/CodeGenerator/CodeGenerator.csproj +++ b/src/Servers/Kestrel/tools/CodeGenerator/CodeGenerator.csproj @@ -9,6 +9,7 @@ + diff --git a/src/Shared/runtime/Http2/Hpack/H2StaticTable.Http2.cs b/src/Shared/runtime/Http2/Hpack/H2StaticTable.Http2.cs new file mode 100644 index 000000000000..71ef9019bc02 --- /dev/null +++ b/src/Shared/runtime/Http2/Hpack/H2StaticTable.Http2.cs @@ -0,0 +1,100 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System.Text; + +namespace System.Net.Http.HPack +{ + internal static partial class H2StaticTable + { + public static int Count => s_staticDecoderTable.Length; + + public static ref readonly HeaderField Get(int index) => ref s_staticDecoderTable[index]; + + public static int GetStatusIndex(int status) => + status switch + { + 200 => 8, + 204 => 9, + 206 => 10, + 304 => 11, + 400 => 12, + 404 => 13, + 500 => 14, + _ => throw new ArgumentOutOfRangeException() + }; + + private static readonly HeaderField[] s_staticDecoderTable = new HeaderField[] + { + CreateHeaderField(":authority", ""), + CreateHeaderField(":method", "GET"), + CreateHeaderField(":method", "POST"), + CreateHeaderField(":path", "/"), + CreateHeaderField(":path", "/index.html"), + CreateHeaderField(":scheme", "http"), + CreateHeaderField(":scheme", "https"), + CreateHeaderField(":status", "200"), + CreateHeaderField(":status", "204"), + CreateHeaderField(":status", "206"), + CreateHeaderField(":status", "304"), + CreateHeaderField(":status", "400"), + CreateHeaderField(":status", "404"), + CreateHeaderField(":status", "500"), + CreateHeaderField("accept-charset", ""), + CreateHeaderField("accept-encoding", "gzip, deflate"), + CreateHeaderField("accept-language", ""), + CreateHeaderField("accept-ranges", ""), + CreateHeaderField("accept", ""), + CreateHeaderField("access-control-allow-origin", ""), + CreateHeaderField("age", ""), + CreateHeaderField("allow", ""), + CreateHeaderField("authorization", ""), + CreateHeaderField("cache-control", ""), + CreateHeaderField("content-disposition", ""), + CreateHeaderField("content-encoding", ""), + CreateHeaderField("content-language", ""), + CreateHeaderField("content-length", ""), + CreateHeaderField("content-location", ""), + CreateHeaderField("content-range", ""), + CreateHeaderField("content-type", ""), + CreateHeaderField("cookie", ""), + CreateHeaderField("date", ""), + CreateHeaderField("etag", ""), + CreateHeaderField("expect", ""), + CreateHeaderField("expires", ""), + CreateHeaderField("from", ""), + CreateHeaderField("host", ""), + CreateHeaderField("if-match", ""), + CreateHeaderField("if-modified-since", ""), + CreateHeaderField("if-none-match", ""), + CreateHeaderField("if-range", ""), + CreateHeaderField("if-unmodified-since", ""), + CreateHeaderField("last-modified", ""), + CreateHeaderField("link", ""), + CreateHeaderField("location", ""), + CreateHeaderField("max-forwards", ""), + CreateHeaderField("proxy-authenticate", ""), + CreateHeaderField("proxy-authorization", ""), + CreateHeaderField("range", ""), + CreateHeaderField("referer", ""), + CreateHeaderField("refresh", ""), + CreateHeaderField("retry-after", ""), + CreateHeaderField("server", ""), + CreateHeaderField("set-cookie", ""), + CreateHeaderField("strict-transport-security", ""), + CreateHeaderField("transfer-encoding", ""), + CreateHeaderField("user-agent", ""), + CreateHeaderField("vary", ""), + CreateHeaderField("via", ""), + CreateHeaderField("www-authenticate", "") + }; + + // TODO: The HeaderField constructor will allocate and copy again. We should avoid this. + // Tackle as part of header table allocation strategy in general (see note in HeaderField constructor). + + private static HeaderField CreateHeaderField(string name, string value) => + new HeaderField( + Encoding.ASCII.GetBytes(name), + value.Length != 0 ? Encoding.ASCII.GetBytes(value) : Array.Empty()); + } +} diff --git a/src/Shared/runtime/Http2/Hpack/H2StaticTable.cs b/src/Shared/runtime/Http2/Hpack/H2StaticTable.cs index 9324c502ee0e..926d1fb71f5e 100644 --- a/src/Shared/runtime/Http2/Hpack/H2StaticTable.cs +++ b/src/Shared/runtime/Http2/Hpack/H2StaticTable.cs @@ -1,103 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Collections.Generic; -using System.Text; - namespace System.Net.Http.HPack { - internal static class H2StaticTable + internal static partial class H2StaticTable { - public static int Count => s_staticDecoderTable.Length; - - public static ref readonly HeaderField Get(int index) => ref s_staticDecoderTable[index]; - - public static int GetStatusIndex(int status) => - status switch - { - 200 => 8, - 204 => 9, - 206 => 10, - 304 => 11, - 400 => 12, - 404 => 13, - 500 => 14, - _ => throw new ArgumentOutOfRangeException() - }; - - private static readonly HeaderField[] s_staticDecoderTable = new HeaderField[] - { - CreateHeaderField(":authority", ""), - CreateHeaderField(":method", "GET"), - CreateHeaderField(":method", "POST"), - CreateHeaderField(":path", "/"), - CreateHeaderField(":path", "/index.html"), - CreateHeaderField(":scheme", "http"), - CreateHeaderField(":scheme", "https"), - CreateHeaderField(":status", "200"), - CreateHeaderField(":status", "204"), - CreateHeaderField(":status", "206"), - CreateHeaderField(":status", "304"), - CreateHeaderField(":status", "400"), - CreateHeaderField(":status", "404"), - CreateHeaderField(":status", "500"), - CreateHeaderField("accept-charset", ""), - CreateHeaderField("accept-encoding", "gzip, deflate"), - CreateHeaderField("accept-language", ""), - CreateHeaderField("accept-ranges", ""), - CreateHeaderField("accept", ""), - CreateHeaderField("access-control-allow-origin", ""), - CreateHeaderField("age", ""), - CreateHeaderField("allow", ""), - CreateHeaderField("authorization", ""), - CreateHeaderField("cache-control", ""), - CreateHeaderField("content-disposition", ""), - CreateHeaderField("content-encoding", ""), - CreateHeaderField("content-language", ""), - CreateHeaderField("content-length", ""), - CreateHeaderField("content-location", ""), - CreateHeaderField("content-range", ""), - CreateHeaderField("content-type", ""), - CreateHeaderField("cookie", ""), - CreateHeaderField("date", ""), - CreateHeaderField("etag", ""), - CreateHeaderField("expect", ""), - CreateHeaderField("expires", ""), - CreateHeaderField("from", ""), - CreateHeaderField("host", ""), - CreateHeaderField("if-match", ""), - CreateHeaderField("if-modified-since", ""), - CreateHeaderField("if-none-match", ""), - CreateHeaderField("if-range", ""), - CreateHeaderField("if-unmodified-since", ""), - CreateHeaderField("last-modified", ""), - CreateHeaderField("link", ""), - CreateHeaderField("location", ""), - CreateHeaderField("max-forwards", ""), - CreateHeaderField("proxy-authenticate", ""), - CreateHeaderField("proxy-authorization", ""), - CreateHeaderField("range", ""), - CreateHeaderField("referer", ""), - CreateHeaderField("refresh", ""), - CreateHeaderField("retry-after", ""), - CreateHeaderField("server", ""), - CreateHeaderField("set-cookie", ""), - CreateHeaderField("strict-transport-security", ""), - CreateHeaderField("transfer-encoding", ""), - CreateHeaderField("user-agent", ""), - CreateHeaderField("vary", ""), - CreateHeaderField("via", ""), - CreateHeaderField("www-authenticate", "") - }; - - // TODO: The HeaderField constructor will allocate and copy again. We should avoid this. - // Tackle as part of header table allocation strategy in general (see note in HeaderField constructor). - - private static HeaderField CreateHeaderField(string name, string value) => - new HeaderField( - Encoding.ASCII.GetBytes(name), - value.Length != 0 ? Encoding.ASCII.GetBytes(value) : Array.Empty()); - // Values for encoding. // Unused values are omitted. public const int Authority = 1; diff --git a/src/Shared/runtime/Http3/QPack/H3StaticTable.Http3.cs b/src/Shared/runtime/Http3/QPack/H3StaticTable.Http3.cs new file mode 100644 index 000000000000..efa5f9b81d62 --- /dev/null +++ b/src/Shared/runtime/Http3/QPack/H3StaticTable.Http3.cs @@ -0,0 +1,154 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System.Collections.Generic; +using System.Text; + +namespace System.Net.Http.QPack +{ + internal static partial class H3StaticTable + { + private static readonly Dictionary s_statusIndex = new Dictionary + { + [103] = 24, + [200] = 25, + [304] = 26, + [404] = 27, + [503] = 28, + [100] = 63, + [204] = 64, + [206] = 65, + [302] = 66, + [400] = 67, + [403] = 68, + [421] = 69, + [425] = 70, + [500] = 71, + }; + + private static readonly Dictionary s_methodIndex = new Dictionary + { + // TODO connect is internal to system.net.http + [HttpMethod.Delete] = 16, + [HttpMethod.Get] = 17, + [HttpMethod.Head] = 18, + [HttpMethod.Options] = 19, + [HttpMethod.Post] = 20, + [HttpMethod.Put] = 21, + }; + + public static int Count => s_staticTable.Length; + + // TODO: just use Dictionary directly to avoid interface dispatch. + public static IReadOnlyDictionary StatusIndex => s_statusIndex; + public static IReadOnlyDictionary MethodIndex => s_methodIndex; + + public static HeaderField GetHeaderFieldAt(int index) => s_staticTable[index]; + + private static readonly HeaderField[] s_staticTable = new HeaderField[] + { + CreateHeaderField(":authority", ""), // 0 + CreateHeaderField(":path", "/"), // 1 + CreateHeaderField("age", "0"), // 2 + CreateHeaderField("content-disposition", ""), + CreateHeaderField("content-length", "0"), + CreateHeaderField("cookie", ""), + CreateHeaderField("date", ""), + CreateHeaderField("etag", ""), + CreateHeaderField("if-modified-since", ""), + CreateHeaderField("if-none-match", ""), + CreateHeaderField("last-modified", ""), // 10 + CreateHeaderField("link", ""), + CreateHeaderField("location", ""), + CreateHeaderField("referer", ""), + CreateHeaderField("set-cookie", ""), + CreateHeaderField(":method", "CONNECT"), + CreateHeaderField(":method", "DELETE"), + CreateHeaderField(":method", "GET"), + CreateHeaderField(":method", "HEAD"), + CreateHeaderField(":method", "OPTIONS"), + CreateHeaderField(":method", "POST"), // 20 + CreateHeaderField(":method", "PUT"), + CreateHeaderField(":scheme", "http"), + CreateHeaderField(":scheme", "https"), + CreateHeaderField(":status", "103"), + CreateHeaderField(":status", "200"), + CreateHeaderField(":status", "304"), + CreateHeaderField(":status", "404"), + CreateHeaderField(":status", "503"), + CreateHeaderField("accept", "*/*"), + CreateHeaderField("accept", "application/dns-message"), // 30 + CreateHeaderField("accept-encoding", "gzip, deflate, br"), + CreateHeaderField("accept-ranges", "bytes"), + CreateHeaderField("access-control-allow-headers", "cache-control"), + CreateHeaderField("access-control-allow-origin", "content-type"), + CreateHeaderField("access-control-allow-origin", "*"), + CreateHeaderField("cache-control", "max-age=0"), + CreateHeaderField("cache-control", "max-age=2592000"), + CreateHeaderField("cache-control", "max-age=604800"), + CreateHeaderField("cache-control", "no-cache"), + CreateHeaderField("cache-control", "no-store"), // 40 + CreateHeaderField("cache-control", "public, max-age=31536000"), + CreateHeaderField("content-encoding", "br"), + CreateHeaderField("content-encoding", "gzip"), + CreateHeaderField("content-type", "application/dns-message"), + CreateHeaderField("content-type", "application/javascript"), + CreateHeaderField("content-type", "application/json"), + CreateHeaderField("content-type", "application/x-www-form-urlencoded"), + CreateHeaderField("content-type", "image/gif"), + CreateHeaderField("content-type", "image/jpeg"), + CreateHeaderField("content-type", "image/png"), // 50 + CreateHeaderField("content-type", "text/css"), + CreateHeaderField("content-type", "text/html; charset=utf-8"), + CreateHeaderField("content-type", "text/plain"), + CreateHeaderField("content-type", "text/plain;charset=utf-8"), + CreateHeaderField("range", "bytes=0-"), + CreateHeaderField("strict-transport-security", "max-age=31536000"), + CreateHeaderField("strict-transport-security", "max-age=31536000;includesubdomains"), // TODO confirm spaces here don't matter? + CreateHeaderField("strict-transport-security", "max-age=31536000;includesubdomains; preload"), + CreateHeaderField("vary", "accept-encoding"), + CreateHeaderField("vary", "origin"), // 60 + CreateHeaderField("x-content-type-options", "nosniff"), + CreateHeaderField("x-xss-protection", "1; mode=block"), + CreateHeaderField(":status", "100"), + CreateHeaderField(":status", "204"), + CreateHeaderField(":status", "206"), + CreateHeaderField(":status", "302"), + CreateHeaderField(":status", "400"), + CreateHeaderField(":status", "403"), + CreateHeaderField(":status", "421"), + CreateHeaderField(":status", "425"), // 70 + CreateHeaderField(":status", "500"), + CreateHeaderField("accept-language", ""), + CreateHeaderField("access-control-allow-credentials", "FALSE"), + CreateHeaderField("access-control-allow-credentials", "TRUE"), + CreateHeaderField("access-control-allow-headers", "*"), + CreateHeaderField("access-control-allow-methods", "get"), + CreateHeaderField("access-control-allow-methods", "get, post, options"), + CreateHeaderField("access-control-allow-methods", "options"), + CreateHeaderField("access-control-expose-headers", "content-length"), + CreateHeaderField("access-control-request-headers", "content-type"), // 80 + CreateHeaderField("access-control-request-method", "get"), + CreateHeaderField("access-control-request-method", "post"), + CreateHeaderField("alt-svc", "clear"), + CreateHeaderField("authorization", ""), + CreateHeaderField("content-security-policy", "script-src 'none'; object-src 'none'; base-uri 'none'"), + CreateHeaderField("early-data", "1"), + CreateHeaderField("expect-ct", ""), + CreateHeaderField("forwarded", ""), + CreateHeaderField("if-range", ""), + CreateHeaderField("origin", ""), // 90 + CreateHeaderField("purpose", "prefetch"), + CreateHeaderField("server", ""), + CreateHeaderField("timing-allow-origin", "*"), + CreateHeaderField("upgrading-insecure-requests", "1"), + CreateHeaderField("user-agent", ""), + CreateHeaderField("x-forwarded-for", ""), + CreateHeaderField("x-frame-options", "deny"), + CreateHeaderField("x-frame-options", "sameorigin"), + }; + + private static HeaderField CreateHeaderField(string name, string value) + => new HeaderField(Encoding.ASCII.GetBytes(name), Encoding.ASCII.GetBytes(value)); + } +} diff --git a/src/Shared/runtime/Http3/QPack/H3StaticTable.cs b/src/Shared/runtime/Http3/QPack/H3StaticTable.cs index ae605971da65..145da1216fb4 100644 --- a/src/Shared/runtime/Http3/QPack/H3StaticTable.cs +++ b/src/Shared/runtime/Http3/QPack/H3StaticTable.cs @@ -1,156 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Collections.Generic; -using System.Text; - namespace System.Net.Http.QPack { - internal static class H3StaticTable + internal static partial class H3StaticTable { - private static readonly Dictionary s_statusIndex = new Dictionary - { - [103] = 24, - [200] = 25, - [304] = 26, - [404] = 27, - [503] = 28, - [100] = 63, - [204] = 64, - [206] = 65, - [302] = 66, - [400] = 67, - [403] = 68, - [421] = 69, - [425] = 70, - [500] = 71, - }; - - private static readonly Dictionary s_methodIndex = new Dictionary - { - // TODO connect is internal to system.net.http - [HttpMethod.Delete] = 16, - [HttpMethod.Get] = 17, - [HttpMethod.Head] = 18, - [HttpMethod.Options] = 19, - [HttpMethod.Post] = 20, - [HttpMethod.Put] = 21, - }; - - public static int Count => s_staticTable.Length; - - // TODO: just use Dictionary directly to avoid interface dispatch. - public static IReadOnlyDictionary StatusIndex => s_statusIndex; - public static IReadOnlyDictionary MethodIndex => s_methodIndex; - - public static HeaderField GetHeaderFieldAt(int index) => s_staticTable[index]; - - private static readonly HeaderField[] s_staticTable = new HeaderField[] - { - CreateHeaderField(":authority", ""), // 0 - CreateHeaderField(":path", "/"), // 1 - CreateHeaderField("age", "0"), // 2 - CreateHeaderField("content-disposition", ""), - CreateHeaderField("content-length", "0"), - CreateHeaderField("cookie", ""), - CreateHeaderField("date", ""), - CreateHeaderField("etag", ""), - CreateHeaderField("if-modified-since", ""), - CreateHeaderField("if-none-match", ""), - CreateHeaderField("last-modified", ""), // 10 - CreateHeaderField("link", ""), - CreateHeaderField("location", ""), - CreateHeaderField("referer", ""), - CreateHeaderField("set-cookie", ""), - CreateHeaderField(":method", "CONNECT"), - CreateHeaderField(":method", "DELETE"), - CreateHeaderField(":method", "GET"), - CreateHeaderField(":method", "HEAD"), - CreateHeaderField(":method", "OPTIONS"), - CreateHeaderField(":method", "POST"), // 20 - CreateHeaderField(":method", "PUT"), - CreateHeaderField(":scheme", "http"), - CreateHeaderField(":scheme", "https"), - CreateHeaderField(":status", "103"), - CreateHeaderField(":status", "200"), - CreateHeaderField(":status", "304"), - CreateHeaderField(":status", "404"), - CreateHeaderField(":status", "503"), - CreateHeaderField("accept", "*/*"), - CreateHeaderField("accept", "application/dns-message"), // 30 - CreateHeaderField("accept-encoding", "gzip, deflate, br"), - CreateHeaderField("accept-ranges", "bytes"), - CreateHeaderField("access-control-allow-headers", "cache-control"), - CreateHeaderField("access-control-allow-origin", "content-type"), - CreateHeaderField("access-control-allow-origin", "*"), - CreateHeaderField("cache-control", "max-age=0"), - CreateHeaderField("cache-control", "max-age=2592000"), - CreateHeaderField("cache-control", "max-age=604800"), - CreateHeaderField("cache-control", "no-cache"), - CreateHeaderField("cache-control", "no-store"), // 40 - CreateHeaderField("cache-control", "public, max-age=31536000"), - CreateHeaderField("content-encoding", "br"), - CreateHeaderField("content-encoding", "gzip"), - CreateHeaderField("content-type", "application/dns-message"), - CreateHeaderField("content-type", "application/javascript"), - CreateHeaderField("content-type", "application/json"), - CreateHeaderField("content-type", "application/x-www-form-urlencoded"), - CreateHeaderField("content-type", "image/gif"), - CreateHeaderField("content-type", "image/jpeg"), - CreateHeaderField("content-type", "image/png"), // 50 - CreateHeaderField("content-type", "text/css"), - CreateHeaderField("content-type", "text/html; charset=utf-8"), - CreateHeaderField("content-type", "text/plain"), - CreateHeaderField("content-type", "text/plain;charset=utf-8"), - CreateHeaderField("range", "bytes=0-"), - CreateHeaderField("strict-transport-security", "max-age=31536000"), - CreateHeaderField("strict-transport-security", "max-age=31536000;includesubdomains"), // TODO confirm spaces here don't matter? - CreateHeaderField("strict-transport-security", "max-age=31536000;includesubdomains; preload"), - CreateHeaderField("vary", "accept-encoding"), - CreateHeaderField("vary", "origin"), // 60 - CreateHeaderField("x-content-type-options", "nosniff"), - CreateHeaderField("x-xss-protection", "1; mode=block"), - CreateHeaderField(":status", "100"), - CreateHeaderField(":status", "204"), - CreateHeaderField(":status", "206"), - CreateHeaderField(":status", "302"), - CreateHeaderField(":status", "400"), - CreateHeaderField(":status", "403"), - CreateHeaderField(":status", "421"), - CreateHeaderField(":status", "425"), // 70 - CreateHeaderField(":status", "500"), - CreateHeaderField("accept-language", ""), - CreateHeaderField("access-control-allow-credentials", "FALSE"), - CreateHeaderField("access-control-allow-credentials", "TRUE"), - CreateHeaderField("access-control-allow-headers", "*"), - CreateHeaderField("access-control-allow-methods", "get"), - CreateHeaderField("access-control-allow-methods", "get, post, options"), - CreateHeaderField("access-control-allow-methods", "options"), - CreateHeaderField("access-control-expose-headers", "content-length"), - CreateHeaderField("access-control-request-headers", "content-type"), // 80 - CreateHeaderField("access-control-request-method", "get"), - CreateHeaderField("access-control-request-method", "post"), - CreateHeaderField("alt-svc", "clear"), - CreateHeaderField("authorization", ""), - CreateHeaderField("content-security-policy", "script-src 'none'; object-src 'none'; base-uri 'none'"), - CreateHeaderField("early-data", "1"), - CreateHeaderField("expect-ct", ""), - CreateHeaderField("forwarded", ""), - CreateHeaderField("if-range", ""), - CreateHeaderField("origin", ""), // 90 - CreateHeaderField("purpose", "prefetch"), - CreateHeaderField("server", ""), - CreateHeaderField("timing-allow-origin", "*"), - CreateHeaderField("upgrading-insecure-requests", "1"), - CreateHeaderField("user-agent", ""), - CreateHeaderField("x-forwarded-for", ""), - CreateHeaderField("x-frame-options", "deny"), - CreateHeaderField("x-frame-options", "sameorigin"), - }; - - private static HeaderField CreateHeaderField(string name, string value) - => new HeaderField(Encoding.ASCII.GetBytes(name), Encoding.ASCII.GetBytes(value)); - public const int Authority = 0; public const int PathSlash = 1; public const int Age0 = 2; From b2f392ba62b2d566f817c55df2492417a5160d7c Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Wed, 12 May 2021 20:35:08 +1200 Subject: [PATCH 08/30] Fix Microsoft.AspNetCore.Testing not writing to output in VS --- src/Testing/src/xunit/AspNetTestInvoker.cs | 11 +++--- src/Testing/src/xunit/AspNetTestRunner.cs | 44 +++++++++++++++++++++- 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/src/Testing/src/xunit/AspNetTestInvoker.cs b/src/Testing/src/xunit/AspNetTestInvoker.cs index a764db6622d0..ab1a7c9694d3 100644 --- a/src/Testing/src/xunit/AspNetTestInvoker.cs +++ b/src/Testing/src/xunit/AspNetTestInvoker.cs @@ -14,6 +14,8 @@ namespace Microsoft.AspNetCore.Testing { internal class AspNetTestInvoker : XunitTestInvoker { + private readonly TestOutputHelper _testOutputHelper; + public AspNetTestInvoker( ITest test, IMessageBus messageBus, @@ -23,17 +25,16 @@ public AspNetTestInvoker( object[] testMethodArguments, IReadOnlyList beforeAfterAttributes, ExceptionAggregator aggregator, - CancellationTokenSource cancellationTokenSource) + CancellationTokenSource cancellationTokenSource, + TestOutputHelper testOutputHelper) : base(test, messageBus, testClass, constructorArguments, testMethod, testMethodArguments, beforeAfterAttributes, aggregator, cancellationTokenSource) { + _testOutputHelper = testOutputHelper; } protected override async Task InvokeTestMethodAsync(object testClassInstance) { - var output = new TestOutputHelper(); - output.Initialize(MessageBus, Test); - - var context = new TestContext(TestClass, ConstructorArguments, TestMethod, TestMethodArguments, output); + var context = new TestContext(TestClass, ConstructorArguments, TestMethod, TestMethodArguments, _testOutputHelper); var lifecycleHooks = GetLifecycleHooks(testClassInstance, TestClass, TestMethod); await Aggregator.RunAsync(async () => diff --git a/src/Testing/src/xunit/AspNetTestRunner.cs b/src/Testing/src/xunit/AspNetTestRunner.cs index 2786a866b417..94a32946a1c0 100644 --- a/src/Testing/src/xunit/AspNetTestRunner.cs +++ b/src/Testing/src/xunit/AspNetTestRunner.cs @@ -13,6 +13,9 @@ namespace Microsoft.AspNetCore.Testing { internal class AspNetTestRunner : XunitTestRunner { + private readonly TestOutputHelper _testOutputHelper; + private readonly bool _ownsTestOutputHelper; + public AspNetTestRunner( ITest test, IMessageBus messageBus, @@ -26,6 +29,45 @@ public AspNetTestRunner( CancellationTokenSource cancellationTokenSource) : base(test, messageBus, testClass, constructorArguments, testMethod, testMethodArguments, skipReason, beforeAfterAttributes, aggregator, cancellationTokenSource) { + // Prioritize using ITestOutputHelper from constructor. + if (ConstructorArguments != null) + { + foreach (var obj in ConstructorArguments) + { + _testOutputHelper = obj as TestOutputHelper; + if (_testOutputHelper != null) + { + break; + } + } + } + + // No ITestOutputHelper in constructor so we'll create it ourselves. + if (_testOutputHelper == null) + { + _testOutputHelper = new TestOutputHelper(); + _ownsTestOutputHelper = true; + } + } + + protected override async Task> InvokeTestAsync(ExceptionAggregator aggregator) + { + if (_ownsTestOutputHelper) + { + _testOutputHelper.Initialize(MessageBus, Test); + } + + var result = await base.InvokeTestAsync(aggregator); + + if (_ownsTestOutputHelper) + { + // Update result with output if we created our own ITestOutputHelper. + // The string returned from this method is what VS displays as the test output. + result = new Tuple(result.Item1, _testOutputHelper.Output); + _testOutputHelper.Uninitialize(); + } + + return result; } protected override async Task InvokeTestMethodAsync(ExceptionAggregator aggregator) @@ -54,7 +96,7 @@ protected override async Task InvokeTestMethodAsync(ExceptionAggregator private Task InvokeTestMethodCoreAsync(ExceptionAggregator aggregator) { - var invoker = new AspNetTestInvoker(Test, MessageBus, TestClass, ConstructorArguments, TestMethod, TestMethodArguments, BeforeAfterAttributes, aggregator, CancellationTokenSource); + var invoker = new AspNetTestInvoker(Test, MessageBus, TestClass, ConstructorArguments, TestMethod, TestMethodArguments, BeforeAfterAttributes, aggregator, CancellationTokenSource, _testOutputHelper); return invoker.RunAsync(); } From 2078ab43aa542589a7626394770395970555ff84 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 12 May 2021 07:37:02 -0700 Subject: [PATCH 09/30] Use dotnet certificate (#32584) --- eng/Signing.props | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/eng/Signing.props b/eng/Signing.props index 4b109d6e03a8..66f8dc2ce805 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -9,6 +9,11 @@ + + + true + + @@ -52,30 +57,30 @@ "None" means don't sign the file itself, but still scan the contents for signable files. --> - - + + - + - - - - - - - - - - - - + + + + + + + + + + + + From bb3bdd76a2601c6ed2a118343788b7eef2ebdd62 Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Wed, 12 May 2021 08:57:00 -0700 Subject: [PATCH 10/30] Update Selenium.WebDriver.ChromeDriver version (#32578) * Update Selenium.WebDriver.ChromeDriver version * Update to nearest available version --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 06933af50162..ecbe26e1d9c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -247,7 +247,7 @@ 3.0.0 7.2.2 4.0.0-beta2 - 89.0.4389.2300 + 90.0.4430.2400 4.0.0-beta2 1.4.0 4.0.0 From a7a6cdd86902b1c7f57e55f95c4054806ed3b276 Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Wed, 12 May 2021 10:03:03 -0700 Subject: [PATCH 11/30] Quarantine ComponentDiscovery_CanFindComponent_WithTypeParameter (#32593) --- .../test/IntegrationTests/ComponentDiscoveryIntegrationTest.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDiscoveryIntegrationTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDiscoveryIntegrationTest.cs index 3743979a0cfe..aece6745d104 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDiscoveryIntegrationTest.cs +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDiscoveryIntegrationTest.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNetCore.Razor.Language.Components; +using Microsoft.AspNetCore.Testing; using Xunit; namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests @@ -83,6 +84,7 @@ public void ComponentDiscovery_CanFindComponent_DefinedinCshtml() } [Fact] + [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/32592")] public void ComponentDiscovery_CanFindComponent_WithTypeParameter() { // Arrange From a14d7685c995c28df7c930effe223d930d5ca905 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Wed, 12 May 2021 11:33:51 -0700 Subject: [PATCH 12/30] Clear caches from more places on a hot reload event (#32509) * Use feature switch to perform hot reload trimming Contributes to https://github.com/dotnet/runtime/issues/51159 * Clear caches from more places on a hot reload event * Rename variable for clarity Co-authored-by: Steve Sanderson --- .../Components/src/ComponentFactory.cs | 4 ++- ...NetCore.Components.WarningSuppressions.xml | 2 +- .../src/Reflection/ComponentProperties.cs | 2 ++ .../Components/src/RenderTree/Renderer.cs | 5 ++++ .../src/Routing/RouteTableFactory.cs | 2 ++ .../Components/src/Routing/Router.cs | 22 +++++++++++++--- .../EditContextDataAnnotationsExtensions.cs | 26 +++++++++++++++++++ ...crosoft.AspNetCore.Components.Forms.csproj | 11 ++++++++ .../src/Properties/ILLink.Substitutions.xml | 7 +++++ .../src/Infrastructure/DotNetDispatcher.cs | 9 +++++++ 10 files changed, 85 insertions(+), 5 deletions(-) create mode 100644 src/Components/Forms/src/Properties/ILLink.Substitutions.xml diff --git a/src/Components/Components/src/ComponentFactory.cs b/src/Components/Components/src/ComponentFactory.cs index 49b3a6a95b3a..c3235a2be405 100644 --- a/src/Components/Components/src/ComponentFactory.cs +++ b/src/Components/Components/src/ComponentFactory.cs @@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Components { - internal class ComponentFactory + internal sealed class ComponentFactory { private static readonly BindingFlags _injectablePropertyBindingFlags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic; @@ -25,6 +25,8 @@ public ComponentFactory(IComponentActivator componentActivator) _componentActivator = componentActivator ?? throw new ArgumentNullException(nameof(componentActivator)); } + public void ClearCache() => _cachedInitializers.Clear(); + public IComponent InstantiateComponent(IServiceProvider serviceProvider, [DynamicallyAccessedMembers(Component)] Type componentType) { var component = _componentActivator.CreateInstance(componentType); diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.WarningSuppressions.xml b/src/Components/Components/src/Microsoft.AspNetCore.Components.WarningSuppressions.xml index 7a1510c2300d..cc79f6d37717 100644 --- a/src/Components/Components/src/Microsoft.AspNetCore.Components.WarningSuppressions.xml +++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.WarningSuppressions.xml @@ -17,7 +17,7 @@ ILLink IL2026 member - M:Microsoft.AspNetCore.Components.RouteTableFactory.<GetRouteableComponents>g__GetRouteableComponents|3_0(System.Collections.Generic.List{System.Type},System.Reflection.Assembly) + M:Microsoft.AspNetCore.Components.RouteTableFactory.<GetRouteableComponents>g__GetRouteableComponents|4_0(System.Collections.Generic.List{System.Type},System.Reflection.Assembly) ILLink diff --git a/src/Components/Components/src/Reflection/ComponentProperties.cs b/src/Components/Components/src/Reflection/ComponentProperties.cs index bab5d9d62957..0f45353abc63 100644 --- a/src/Components/Components/src/Reflection/ComponentProperties.cs +++ b/src/Components/Components/src/Reflection/ComponentProperties.cs @@ -20,6 +20,8 @@ internal static class ComponentProperties private readonly static ConcurrentDictionary _cachedWritersByType = new ConcurrentDictionary(); + public static void ClearCache() => _cachedWritersByType.Clear(); + public static void SetProperties(in ParameterView parameters, object target) { if (target == null) diff --git a/src/Components/Components/src/RenderTree/Renderer.cs b/src/Components/Components/src/RenderTree/Renderer.cs index b059b1998f20..fdc9b32d6210 100644 --- a/src/Components/Components/src/RenderTree/Renderer.cs +++ b/src/Components/Components/src/RenderTree/Renderer.cs @@ -10,6 +10,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Components.HotReload; +using Microsoft.AspNetCore.Components.Reflection; using Microsoft.AspNetCore.Components.Rendering; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; @@ -126,6 +127,10 @@ private static IComponentActivator GetComponentActivatorOrDefault(IServiceProvid private async void RenderRootComponentsOnHotReload() { + // Before re-rendering the root component, also clear any well-known caches in the framework + _componentFactory.ClearCache(); + ComponentProperties.ClearCache(); + await Dispatcher.InvokeAsync(() => { if (_rootComponents is null) diff --git a/src/Components/Components/src/Routing/RouteTableFactory.cs b/src/Components/Components/src/Routing/RouteTableFactory.cs index e2ecd0edb7b1..e8f263fd08b8 100644 --- a/src/Components/Components/src/Routing/RouteTableFactory.cs +++ b/src/Components/Components/src/Routing/RouteTableFactory.cs @@ -30,6 +30,8 @@ public static RouteTable Create(RouteKey routeKey) return routeTable; } + public static void ClearCaches() => Cache.Clear(); + private static List GetRouteableComponents(RouteKey routeKey) { var routeableComponents = new List(); diff --git a/src/Components/Components/src/Routing/Router.cs b/src/Components/Components/src/Routing/Router.cs index 320403015858..e82af103b3da 100644 --- a/src/Components/Components/src/Routing/Router.cs +++ b/src/Components/Components/src/Routing/Router.cs @@ -9,6 +9,7 @@ using System.Runtime.ExceptionServices; using System.Threading; using System.Threading.Tasks; +using Microsoft.AspNetCore.Components.HotReload; using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Components.Routing @@ -33,7 +34,7 @@ static readonly IReadOnlyDictionary _emptyParametersDictionary private Task _previousOnNavigateTask = Task.CompletedTask; - private RouteKey _currentRouteKey; + private RouteKey _routeTableLastBuiltForRouteKey; private bool _onNavigateCalled = false; @@ -91,6 +92,11 @@ public void Attach(RenderHandle renderHandle) _baseUri = NavigationManager.BaseUri; _locationAbsolute = NavigationManager.Uri; NavigationManager.LocationChanged += OnLocationChanged; + + if (HotReloadFeature.IsSupported) + { + HotReloadManager.OnDeltaApplied += ClearRouteCaches; + } } /// @@ -131,6 +137,10 @@ public async Task SetParametersAsync(ParameterView parameters) public void Dispose() { NavigationManager.LocationChanged -= OnLocationChanged; + if (HotReloadFeature.IsSupported) + { + HotReloadManager.OnDeltaApplied -= ClearRouteCaches; + } } private static string StringUntilAny(string str, char[] chars) @@ -145,13 +155,19 @@ private void RefreshRouteTable() { var routeKey = new RouteKey(AppAssembly, AdditionalAssemblies); - if (!routeKey.Equals(_currentRouteKey)) + if (!routeKey.Equals(_routeTableLastBuiltForRouteKey)) { - _currentRouteKey = routeKey; + _routeTableLastBuiltForRouteKey = routeKey; Routes = RouteTableFactory.Create(routeKey); } } + private void ClearRouteCaches() + { + RouteTableFactory.ClearCaches(); + _routeTableLastBuiltForRouteKey = default; + } + internal virtual void Refresh(bool isNavigationIntercepted) { // If an `OnNavigateAsync` task is currently in progress, then wait diff --git a/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs b/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs index a88060552c8c..ff0632370c92 100644 --- a/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs +++ b/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs @@ -7,7 +7,11 @@ using System.ComponentModel.DataAnnotations; using System.Diagnostics.CodeAnalysis; using System.Reflection; +using System.Reflection.Metadata; using System.Runtime.InteropServices; +using Microsoft.AspNetCore.Components.HotReload; + +[assembly: MetadataUpdateHandler(typeof(Microsoft.AspNetCore.Components.Forms.EditContextDataAnnotationsExtensions))] namespace Microsoft.AspNetCore.Components.Forms { @@ -37,6 +41,13 @@ public static IDisposable EnableDataAnnotationsValidation(this EditContext editC return new DataAnnotationsEventSubscriptions(editContext); } + private static event Action? OnClearCache; + + private static void ClearCache(Type[]? _) + { + OnClearCache?.Invoke(); + } + private sealed class DataAnnotationsEventSubscriptions : IDisposable { private static readonly ConcurrentDictionary<(Type ModelType, string FieldName), PropertyInfo?> _propertyInfoCache = new(); @@ -51,6 +62,11 @@ public DataAnnotationsEventSubscriptions(EditContext editContext) _editContext.OnFieldChanged += OnFieldChanged; _editContext.OnValidationRequested += OnValidationRequested; + + if (HotReloadFeature.IsSupported) + { + OnClearCache += ClearCache; + } } private void OnFieldChanged(object? sender, FieldChangedEventArgs eventArgs) @@ -115,6 +131,11 @@ public void Dispose() _editContext.OnFieldChanged -= OnFieldChanged; _editContext.OnValidationRequested -= OnValidationRequested; _editContext.NotifyValidationStateChanged(); + + if (HotReloadFeature.IsSupported) + { + OnClearCache -= ClearCache; + } } private static bool TryGetValidatableProperty(in FieldIdentifier fieldIdentifier, [NotNullWhen(true)] out PropertyInfo? propertyInfo) @@ -132,6 +153,11 @@ private static bool TryGetValidatableProperty(in FieldIdentifier fieldIdentifier return propertyInfo != null; } + + internal void ClearCache() + { + _propertyInfoCache.Clear(); + } } } } diff --git a/src/Components/Forms/src/Microsoft.AspNetCore.Components.Forms.csproj b/src/Components/Forms/src/Microsoft.AspNetCore.Components.Forms.csproj index 7ac8a9203e0f..12b071a02268 100644 --- a/src/Components/Forms/src/Microsoft.AspNetCore.Components.Forms.csproj +++ b/src/Components/Forms/src/Microsoft.AspNetCore.Components.Forms.csproj @@ -9,8 +9,19 @@ true + + + + + + + + + + ILLink.Substitutions.xml + diff --git a/src/Components/Forms/src/Properties/ILLink.Substitutions.xml b/src/Components/Forms/src/Properties/ILLink.Substitutions.xml new file mode 100644 index 000000000000..6e9602f33f95 --- /dev/null +++ b/src/Components/Forms/src/Properties/ILLink.Substitutions.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/JSInterop/Microsoft.JSInterop/src/Infrastructure/DotNetDispatcher.cs b/src/JSInterop/Microsoft.JSInterop/src/Infrastructure/DotNetDispatcher.cs index ad96e5e9c97f..0bf276fb2956 100644 --- a/src/JSInterop/Microsoft.JSInterop/src/Infrastructure/DotNetDispatcher.cs +++ b/src/JSInterop/Microsoft.JSInterop/src/Infrastructure/DotNetDispatcher.cs @@ -6,11 +6,14 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Reflection; +using System.Reflection.Metadata; using System.Runtime.ExceptionServices; using System.Text; using System.Text.Json; using System.Threading.Tasks; +[assembly: MetadataUpdateHandler(typeof(Microsoft.JSInterop.Infrastructure.DotNetDispatcher))] + namespace Microsoft.JSInterop.Infrastructure { /// @@ -426,6 +429,12 @@ private static Assembly GetRequiredLoadedAssembly(AssemblyKey assemblyKey) ?? throw new ArgumentException($"There is no loaded assembly with the name '{assemblyKey.AssemblyName}'."); } + private static void ClearCache(Type[]? _) + { + _cachedMethodsByAssembly.Clear(); + _cachedMethodsByType.Clear(); + } + private readonly struct AssemblyKey : IEquatable { public AssemblyKey(Assembly assembly) From 7952eae133bcf89737526b693ed6ed6a630cdbb3 Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Wed, 12 May 2021 11:47:51 -0700 Subject: [PATCH 13/30] Update JS dependencies to latest version in semver range (#32577) * Update JS dependencies to latest version in semver range * Bump ws to 7.4.5 --- src/Components/Web.JS/yarn.lock | 1187 ++++++++--------- .../Microsoft.JSInterop.JS/src/yarn.lock | 85 +- .../clients/ts/FunctionalTests/yarn.lock | 224 ++-- src/SignalR/clients/ts/common/package.json | 4 +- src/SignalR/clients/ts/common/yarn.lock | 745 +++++------ .../ts/signalr-protocol-msgpack/yarn.lock | 18 +- src/SignalR/clients/ts/signalr/package.json | 6 +- src/SignalR/clients/ts/signalr/yarn.lock | 45 +- 8 files changed, 1146 insertions(+), 1168 deletions(-) diff --git a/src/Components/Web.JS/yarn.lock b/src/Components/Web.JS/yarn.lock index 425df5dda5c2..f32fb0b8e7b1 100644 --- a/src/Components/Web.JS/yarn.lock +++ b/src/Components/Web.JS/yarn.lock @@ -16,75 +16,38 @@ dependencies: "@babel/highlight" "^7.12.13" -"@babel/compat-data@^7.13.0": - version "7.13.6" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.6.tgz#11972d07db4c2317afdbf41d6feb3a730301ef4e" - integrity sha512-VhgqKOWYVm7lQXlvbJnWOzwfAQATd2nV52koT0HZ/LdDH0m4DUDwkKYsH+IwpXb+bKPyBJzawA4I6nBKqZcpQw== +"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.13.15", "@babel/compat-data@^7.13.8", "@babel/compat-data@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.0.tgz#a901128bce2ad02565df95e6ecbf195cf9465919" + integrity sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q== -"@babel/compat-data@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.8.tgz#5b783b9808f15cef71547f1b691f34f8ff6003a6" - integrity sha512-EaI33z19T4qN3xLXsGf48M2cDqa6ei9tPZlfLdb2HC+e/cFtREiRd8hdSqDbwdLB0/+gLwqJmCYASH0z2bUdog== - -"@babel/core@^7.1.0", "@babel/core@^7.7.5": - version "7.13.1" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.1.tgz#7ddd027176debe40f13bb88bac0c21218c5b1ecf" - integrity sha512-FzeKfFBG2rmFtGiiMdXZPFt/5R5DXubVi82uYhjGX4Msf+pgYQMCFIqFXZWs5vbIYbf14VeBIgdGI03CDOOM1w== +"@babel/core@^7.1.0", "@babel/core@^7.13.10", "@babel/core@^7.7.5": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.0.tgz#47299ff3ec8d111b493f1a9d04bf88c04e728d88" + integrity sha512-8YqpRig5NmIHlMLw09zMlPTvUVMILjqCOtVgu+TVNWEBvy9b5I3RRyhqnrV4hjgEK7n8P9OqvkWJAFmEL6Wwfw== dependencies: "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.13.0" - "@babel/helper-compilation-targets" "^7.13.0" - "@babel/helper-module-transforms" "^7.13.0" - "@babel/helpers" "^7.13.0" - "@babel/parser" "^7.13.0" + "@babel/generator" "^7.14.0" + "@babel/helper-compilation-targets" "^7.13.16" + "@babel/helper-module-transforms" "^7.14.0" + "@babel/helpers" "^7.14.0" + "@babel/parser" "^7.14.0" "@babel/template" "^7.12.13" - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" + "@babel/traverse" "^7.14.0" + "@babel/types" "^7.14.0" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.1.2" - lodash "^4.17.19" - semver "7.0.0" - source-map "^0.5.0" - -"@babel/core@^7.13.10": - version "7.13.10" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.10.tgz#07de050bbd8193fcd8a3c27918c0890613a94559" - integrity sha512-bfIYcT0BdKeAZrovpMqX2Mx5NrgAckGbwT982AkdS5GNfn3KMGiprlBAtmBcFZRUmpaufS6WZFP8trvx8ptFDw== - dependencies: - "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.13.9" - "@babel/helper-compilation-targets" "^7.13.10" - "@babel/helper-module-transforms" "^7.13.0" - "@babel/helpers" "^7.13.10" - "@babel/parser" "^7.13.10" - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.2" - json5 "^2.1.2" - lodash "^4.17.19" semver "^6.3.0" source-map "^0.5.0" -"@babel/generator@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.0.tgz#bd00d4394ca22f220390c56a0b5b85568ec1ec0c" - integrity sha512-zBZfgvBB/ywjx0Rgc2+BwoH/3H+lDtlgD4hBOpEv5LxRnYsm/753iRuLepqnYlynpjC3AdQxtxsoeHJoEEwOAw== - dependencies: - "@babel/types" "^7.13.0" - jsesc "^2.5.1" - source-map "^0.5.0" - -"@babel/generator@^7.13.9": - version "7.13.9" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.9.tgz#3a7aa96f9efb8e2be42d38d80e2ceb4c64d8de39" - integrity sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw== +"@babel/generator@^7.14.0": + version "7.14.1" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.1.tgz#1f99331babd65700183628da186f36f63d615c93" + integrity sha512-TMGhsXMXCP/O1WtQmZjpEYDhCYC9vFhayWZPJSZCGkPJgUqX0rF0wwtrYvnzVxIjcF80tkUertXVk5cwqi5cAQ== dependencies: - "@babel/types" "^7.13.0" + "@babel/types" "^7.14.1" jsesc "^2.5.1" source-map "^0.5.0" @@ -103,35 +66,26 @@ "@babel/helper-explode-assignable-expression" "^7.12.13" "@babel/types" "^7.12.13" -"@babel/helper-compilation-targets@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.0.tgz#c9cf29b82a76fd637f0faa35544c4ace60a155a1" - integrity sha512-SOWD0JK9+MMIhTQiUVd4ng8f3NXhPVQvTv7D3UN4wbp/6cAHnB2EmMaU1zZA2Hh1gwme+THBrVSqTFxHczTh0Q== +"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.16", "@babel/helper-compilation-targets@^7.13.8": + version "7.13.16" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz#6e91dccf15e3f43e5556dffe32d860109887563c" + integrity sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA== dependencies: - "@babel/compat-data" "^7.13.0" - "@babel/helper-validator-option" "^7.12.17" - browserslist "^4.14.5" - semver "7.0.0" - -"@babel/helper-compilation-targets@^7.13.10", "@babel/helper-compilation-targets@^7.13.8": - version "7.13.10" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.10.tgz#1310a1678cb8427c07a753750da4f8ce442bdd0c" - integrity sha512-/Xju7Qg1GQO4mHZ/Kcs6Au7gfafgZnwm+a7sy/ow/tV1sHeraRUHbjdat8/UvDor4Tez+siGKDk6zIKtCPKVJA== - dependencies: - "@babel/compat-data" "^7.13.8" + "@babel/compat-data" "^7.13.15" "@babel/helper-validator-option" "^7.12.17" browserslist "^4.14.5" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.0.tgz#28d04ad9cfbd1ed1d8b988c9ea7b945263365846" - integrity sha512-twwzhthM4/+6o9766AW2ZBHpIHPSGrPGk1+WfHiu13u/lBnggXGNYCpeAyVfNwGDKfkhEDp+WOD/xafoJ2iLjA== +"@babel/helper-create-class-features-plugin@^7.13.0", "@babel/helper-create-class-features-plugin@^7.14.0": + version "7.14.1" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.1.tgz#1fe11b376f3c41650ad9fedc665b0068722ea76c" + integrity sha512-r8rsUahG4ywm0QpGcCrLaUSOuNAISR3IZCg4Fx05Ozq31aCUrQsTLH6KPxy0N5ULoQ4Sn9qjNdGNtbPWAC6hYg== dependencies: + "@babel/helper-annotate-as-pure" "^7.12.13" "@babel/helper-function-name" "^7.12.13" - "@babel/helper-member-expression-to-functions" "^7.13.0" + "@babel/helper-member-expression-to-functions" "^7.13.12" "@babel/helper-optimise-call-expression" "^7.12.13" - "@babel/helper-replace-supers" "^7.13.0" + "@babel/helper-replace-supers" "^7.13.12" "@babel/helper-split-export-declaration" "^7.12.13" "@babel/helper-create-regexp-features-plugin@^7.12.13": @@ -142,10 +96,10 @@ "@babel/helper-annotate-as-pure" "^7.12.13" regexpu-core "^4.7.1" -"@babel/helper-define-polyfill-provider@^0.1.2": - version "0.1.2" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.2.tgz#619f01afe1deda460676c25c463b42eaefdb71a2" - integrity sha512-hWeolZJivTNGHXHzJjQz/NwDaG4mGXf22ZroOP8bQYgvHNzaQ5tylsVbAcAS2oDjXBwpu8qH2I/654QFS2rDpw== +"@babel/helper-define-polyfill-provider@^0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.0.tgz#a640051772045fedaaecc6f0c6c69f02bdd34bf1" + integrity sha512-JT8tHuFjKBo8NnaUbblz7mIu1nnvUDiHVjXXkulZULyidvo/7P6TY7+YqpV37IfF+KUFxmlK04elKtGKXaiVgw== dependencies: "@babel/helper-compilation-targets" "^7.13.0" "@babel/helper-module-imports" "^7.12.13" @@ -180,41 +134,40 @@ "@babel/types" "^7.12.13" "@babel/helper-hoist-variables@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.0.tgz#5d5882e855b5c5eda91e0cadc26c6e7a2c8593d8" - integrity sha512-0kBzvXiIKfsCA0y6cFEIJf4OdzfpRuNk4+YTeHZpGGc666SATFKTz6sRncwFnQk7/ugJ4dSrCj6iJuvW4Qwr2g== + version "7.13.16" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.16.tgz#1b1651249e94b51f8f0d33439843e33e39775b30" + integrity sha512-1eMtTrXtrwscjcAeO4BVK+vvkxaLJSPFz1w1KLawz6HLNi9bPFGBNwwDyVfiu1Tv/vRRFYfoGaKhmAQPGPn5Wg== dependencies: - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" + "@babel/traverse" "^7.13.15" + "@babel/types" "^7.13.16" -"@babel/helper-member-expression-to-functions@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz#6aa4bb678e0f8c22f58cdb79451d30494461b091" - integrity sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ== +"@babel/helper-member-expression-to-functions@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz#dfe368f26d426a07299d8d6513821768216e6d72" + integrity sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw== dependencies: - "@babel/types" "^7.13.0" + "@babel/types" "^7.13.12" -"@babel/helper-module-imports@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz#ec67e4404f41750463e455cc3203f6a32e93fcb0" - integrity sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g== +"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977" + integrity sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA== dependencies: - "@babel/types" "^7.12.13" + "@babel/types" "^7.13.12" -"@babel/helper-module-transforms@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz#42eb4bd8eea68bab46751212c357bfed8b40f6f1" - integrity sha512-Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw== +"@babel/helper-module-transforms@^7.13.0", "@babel/helper-module-transforms@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.0.tgz#8fcf78be220156f22633ee204ea81f73f826a8ad" + integrity sha512-L40t9bxIuGOfpIGA3HNkJhU9qYrf4y5A5LUSw7rGMSn+pcG8dfJ0g6Zval6YJGd2nEjI7oP00fRdnhLKndx6bw== dependencies: - "@babel/helper-module-imports" "^7.12.13" - "@babel/helper-replace-supers" "^7.13.0" - "@babel/helper-simple-access" "^7.12.13" + "@babel/helper-module-imports" "^7.13.12" + "@babel/helper-replace-supers" "^7.13.12" + "@babel/helper-simple-access" "^7.13.12" "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/helper-validator-identifier" "^7.12.11" + "@babel/helper-validator-identifier" "^7.14.0" "@babel/template" "^7.12.13" - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" - lodash "^4.17.19" + "@babel/traverse" "^7.14.0" + "@babel/types" "^7.14.0" "@babel/helper-optimise-call-expression@^7.12.13": version "7.12.13" @@ -237,22 +190,22 @@ "@babel/helper-wrap-function" "^7.13.0" "@babel/types" "^7.13.0" -"@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz#6034b7b51943094cb41627848cb219cb02be1d24" - integrity sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw== +"@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.13.0", "@babel/helper-replace-supers@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz#6442f4c1ad912502481a564a7386de0c77ff3804" + integrity sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw== dependencies: - "@babel/helper-member-expression-to-functions" "^7.13.0" + "@babel/helper-member-expression-to-functions" "^7.13.12" "@babel/helper-optimise-call-expression" "^7.12.13" "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" + "@babel/types" "^7.13.12" -"@babel/helper-simple-access@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz#8478bcc5cacf6aa1672b251c1d2dde5ccd61a6c4" - integrity sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA== +"@babel/helper-simple-access@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz#dd6c538afb61819d205a012c31792a39c7a5eaf6" + integrity sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA== dependencies: - "@babel/types" "^7.12.13" + "@babel/types" "^7.13.12" "@babel/helper-skip-transparent-expression-wrappers@^7.12.1": version "7.12.1" @@ -268,10 +221,10 @@ dependencies: "@babel/types" "^7.12.13" -"@babel/helper-validator-identifier@^7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed" - integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== +"@babel/helper-validator-identifier@^7.12.11", "@babel/helper-validator-identifier@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288" + integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A== "@babel/helper-validator-option@^7.12.17": version "7.12.17" @@ -288,47 +241,42 @@ "@babel/traverse" "^7.13.0" "@babel/types" "^7.13.0" -"@babel/helpers@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.0.tgz#7647ae57377b4f0408bf4f8a7af01c42e41badc0" - integrity sha512-aan1MeFPxFacZeSz6Ld7YZo5aPuqnKlD7+HZY75xQsueczFccP9A7V05+oe0XpLwHK3oLorPe9eaAUljL7WEaQ== +"@babel/helpers@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.0.tgz#ea9b6be9478a13d6f961dbb5f36bf75e2f3b8f62" + integrity sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg== dependencies: "@babel/template" "^7.12.13" - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" - -"@babel/helpers@^7.13.10": - version "7.13.10" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.10.tgz#fd8e2ba7488533cdeac45cc158e9ebca5e3c7df8" - integrity sha512-4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ== - dependencies: - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" + "@babel/traverse" "^7.14.0" + "@babel/types" "^7.14.0" "@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.12.13.tgz#8ab538393e00370b26271b01fa08f7f27f2e795c" - integrity sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww== + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz#3197e375711ef6bf834e67d0daec88e4f46113cf" + integrity sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg== dependencies: - "@babel/helper-validator-identifier" "^7.12.11" + "@babel/helper-validator-identifier" "^7.14.0" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.13.0": - version "7.13.4" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.4.tgz#340211b0da94a351a6f10e63671fa727333d13ab" - integrity sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA== +"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.14.0": + version "7.14.1" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.1.tgz#1bd644b5db3f5797c4479d89ec1817fe02b84c47" + integrity sha512-muUGEKu8E/ftMTPlNp+mc6zL3E9zKWmF5sDHZ5MSsoTP9Wyz64AhEf9kD08xYJ7w6Hdcu8H550ircnPyWSIF0Q== -"@babel/parser@^7.13.10": - version "7.13.10" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.10.tgz#8f8f9bf7b3afa3eabd061f7a5bcdf4fec3c48409" - integrity sha512-0s7Mlrw9uTWkYua7xWr99Wpk2bnGa0ANleKfksYAES8LpWH4gW1OUr42vqKNf0us5UQNfru2wPqMqRITzq/SIQ== +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz#a3484d84d0b549f3fc916b99ee4783f26fabad2a" + integrity sha512-d0u3zWKcoZf379fOeJdr1a5WPDny4aOFZ6hlfKivgK0LY7ZxNfoaHL2fWwdGtHyVvra38FC+HVYkO+byfSA8AQ== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" + "@babel/plugin-proposal-optional-chaining" "^7.13.12" -"@babel/plugin-proposal-async-generator-functions@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.8.tgz#87aacb574b3bc4b5603f6fe41458d72a5a2ec4b1" - integrity sha512-rPBnhj+WgoSmgq+4gQUtXx/vOcU+UYtjy1AA/aeD61Hwj410fwYyqfUcRP3lR8ucgliVJL/G7sXcNUecC75IXA== +"@babel/plugin-proposal-async-generator-functions@^7.13.15": + version "7.13.15" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.15.tgz#80e549df273a3b3050431b148c892491df1bcc5b" + integrity sha512-VapibkWzFeoa6ubXy/NgV5U2U4MVnUlvnx6wo1XhlsaTrLYWE0UFpDQsVrmn22q5CzeloqJ8gEMHSKxuee6ZdA== dependencies: "@babel/helper-plugin-utils" "^7.13.0" "@babel/helper-remap-async-to-generator" "^7.13.0" @@ -342,6 +290,14 @@ "@babel/helper-create-class-features-plugin" "^7.13.0" "@babel/helper-plugin-utils" "^7.13.0" +"@babel/plugin-proposal-class-static-block@^7.13.11": + version "7.13.11" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.13.11.tgz#6fcbba4a962702c17e5371a0c7b39afde186d703" + integrity sha512-fJTdFI4bfnMjvxJyNuaf8i9mVcZ0UhetaGEUHaHV9KEnibLugJkZAtXikR8KcYj+NYmI4DZMS8yQAyg+hvfSqg== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/plugin-syntax-class-static-block" "^7.12.13" + "@babel/plugin-proposal-dynamic-import@^7.13.8": version "7.13.8" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz#876a1f6966e1dec332e8c9451afda3bebcdf2e1d" @@ -409,10 +365,10 @@ "@babel/helper-plugin-utils" "^7.13.0" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" -"@babel/plugin-proposal-optional-chaining@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.8.tgz#e39df93efe7e7e621841babc197982e140e90756" - integrity sha512-hpbBwbTgd7Cz1QryvwJZRo1U0k1q8uyBmeXOSQUjdg/A2TASkhR/rz7AyqZ/kS8kbpsNA80rOYbxySBJAqmhhQ== +"@babel/plugin-proposal-optional-chaining@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz#ba9feb601d422e0adea6760c2bd6bbb7bfec4866" + integrity sha512-fcEdKOkIB7Tf4IxrgEVeFC4zeJSTr78no9wTdBuZZbqF64kzllU0ybo2zrzm7gUQfxGhBgq4E39oRs8Zx/RMYQ== dependencies: "@babel/helper-plugin-utils" "^7.13.0" "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" @@ -426,6 +382,16 @@ "@babel/helper-create-class-features-plugin" "^7.13.0" "@babel/helper-plugin-utils" "^7.13.0" +"@babel/plugin-proposal-private-property-in-object@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.0.tgz#b1a1f2030586b9d3489cc26179d2eb5883277636" + integrity sha512-59ANdmEwwRUkLjB7CRtwJxxwtjESw+X2IePItA+RGQh+oy5RmpCh/EvVVvh5XQc3yxsm5gtv0+i9oBZhaDNVTg== + dependencies: + "@babel/helper-annotate-as-pure" "^7.12.13" + "@babel/helper-create-class-features-plugin" "^7.14.0" + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/plugin-syntax-private-property-in-object" "^7.14.0" + "@babel/plugin-proposal-unicode-property-regex@^7.12.13", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz#bebde51339be829c17aaaaced18641deb62b39ba" @@ -455,6 +421,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.12.13" +"@babel/plugin-syntax-class-static-block@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.12.13.tgz#8e3d674b0613e67975ceac2776c97b60cafc5c9c" + integrity sha512-ZmKQ0ZXR0nYpHZIIuj9zE7oIqCx2hw9TKi+lIo73NNrMPAZGHfS92/VRV0ZmPj6H2ffBgyFHXvJ5NYsNeEaP2A== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + "@babel/plugin-syntax-dynamic-import@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" @@ -525,6 +498,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" +"@babel/plugin-syntax-private-property-in-object@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.0.tgz#762a4babec61176fec6c88480dec40372b140c0b" + integrity sha512-bda3xF8wGl5/5btF794utNOL0Jw+9jE5C1sLZcoK7c4uonE/y3iQiyG+KbkF3WBV/paX58VCpjhxLPkdj5Fe4w== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/plugin-syntax-top-level-await@^7.12.13", "@babel/plugin-syntax-top-level-await@^7.8.3": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178" @@ -555,12 +535,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-block-scoping@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz#f36e55076d06f41dfd78557ea039c1b581642e61" - integrity sha512-Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ== +"@babel/plugin-transform-block-scoping@^7.14.1": + version "7.14.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.1.tgz#ac1b3a8e3d8cbb31efc6b9be2f74eb9823b74ab2" + integrity sha512-2mQXd0zBrwfp0O1moWIhPpEeTKDvxyHcnma3JATVP1l+CctWBuot6OJG8LQ4DnBj4ZZPSmlb/fm4mu47EOAnVA== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.13.0" "@babel/plugin-transform-classes@^7.13.0": version "7.13.0" @@ -582,10 +562,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.13.0" -"@babel/plugin-transform-destructuring@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.0.tgz#c5dce270014d4e1ebb1d806116694c12b7028963" - integrity sha512-zym5em7tePoNT9s964c0/KU3JPPnuq7VhIxPRefJ4/s82cD+q1mgKfuGRDMCPL0HTyKz4dISuQlCusfgCJ86HA== +"@babel/plugin-transform-destructuring@^7.13.17": + version "7.13.17" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.17.tgz#678d96576638c19d5b36b332504d3fd6e06dea27" + integrity sha512-UAUqiLv+uRLO+xuBKKMEpC+t7YRNVRqBsWWq1yKXbBZBje/t3IXCiSinZhjn/DC3qzBfICeYd2EFGEbHsh5RLA== dependencies: "@babel/helper-plugin-utils" "^7.13.0" @@ -641,23 +621,23 @@ dependencies: "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-modules-amd@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz#19f511d60e3d8753cc5a6d4e775d3a5184866cc3" - integrity sha512-EKy/E2NHhY/6Vw5d1k3rgoobftcNUmp9fGjb9XZwQLtTctsRBOTRO7RHHxfIky1ogMN5BxN7p9uMA3SzPfotMQ== +"@babel/plugin-transform-modules-amd@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.0.tgz#589494b5b290ff76cf7f59c798011f6d77026553" + integrity sha512-CF4c5LX4LQ03LebQxJ5JZes2OYjzBuk1TdiF7cG7d5dK4lAdw9NZmaxq5K/mouUdNeqwz3TNjnW6v01UqUNgpQ== dependencies: - "@babel/helper-module-transforms" "^7.13.0" + "@babel/helper-module-transforms" "^7.14.0" "@babel/helper-plugin-utils" "^7.13.0" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-commonjs@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.13.8.tgz#7b01ad7c2dcf2275b06fa1781e00d13d420b3e1b" - integrity sha512-9QiOx4MEGglfYZ4XOnU79OHr6vIWUakIj9b4mioN8eQIoEh+pf5p/zEB36JpDFWA12nNMiRf7bfoRvl9Rn79Bw== +"@babel/plugin-transform-modules-commonjs@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.0.tgz#52bc199cb581e0992edba0f0f80356467587f161" + integrity sha512-EX4QePlsTaRZQmw9BsoPeyh5OCtRGIhwfLquhxGp5e32w+dyL8htOcDwamlitmNFK6xBZYlygjdye9dbd9rUlQ== dependencies: - "@babel/helper-module-transforms" "^7.13.0" + "@babel/helper-module-transforms" "^7.14.0" "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-simple-access" "^7.12.13" + "@babel/helper-simple-access" "^7.13.12" babel-plugin-dynamic-import-node "^2.3.3" "@babel/plugin-transform-modules-systemjs@^7.13.8": @@ -671,12 +651,12 @@ "@babel/helper-validator-identifier" "^7.12.11" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-umd@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.13.0.tgz#8a3d96a97d199705b9fd021580082af81c06e70b" - integrity sha512-D/ILzAh6uyvkWjKKyFE/W0FzWwasv6vPTSqPcjxFqn6QpX3u8DjRVliq4F2BamO2Wee/om06Vyy+vPkNrd4wxw== +"@babel/plugin-transform-modules-umd@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.0.tgz#2f8179d1bbc9263665ce4a65f305526b2ea8ac34" + integrity sha512-nPZdnWtXXeY7I87UZr9VlsWme3Y0cfFFE41Wbxz4bbaexAjNMInXPFUpRRUJ8NoMm0Cw+zxbqjdPmLhcjfazMw== dependencies: - "@babel/helper-module-transforms" "^7.13.0" + "@babel/helper-module-transforms" "^7.14.0" "@babel/helper-plugin-utils" "^7.13.0" "@babel/plugin-transform-named-capturing-groups-regex@^7.12.13": @@ -715,10 +695,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-regenerator@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz#b628bcc9c85260ac1aeb05b45bde25210194a2f5" - integrity sha512-lxb2ZAvSLyJ2PEe47hoGWPmW22v7CtSl9jW8mingV4H2sEX/JOcrAj2nPuGWi56ERUm2bUpjKzONAuT6HCn2EA== +"@babel/plugin-transform-regenerator@^7.13.15": + version "7.13.15" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz#e5eb28945bf8b6563e7f818945f966a8d2997f39" + integrity sha512-Bk9cOLSz8DiurcMETZ8E2YtIVJbFCPGW28DJWUakmyVWtQSm6Wsf0p4B4BfEr/eL2Nkhe/CICiUiMOCi1TPhuQ== dependencies: regenerator-transform "^0.14.2" @@ -781,16 +761,18 @@ "@babel/helper-plugin-utils" "^7.12.13" "@babel/preset-env@^7.13.10": - version "7.13.10" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.13.10.tgz#b5cde31d5fe77ab2a6ab3d453b59041a1b3a5252" - integrity sha512-nOsTScuoRghRtUsRr/c69d042ysfPHcu+KOB4A9aAO9eJYqrkat+LF8G1yp1HD18QiwixT2CisZTr/0b3YZPXQ== + version "7.14.1" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.1.tgz#b55914e2e68885ea03f69600b2d3537e54574a93" + integrity sha512-0M4yL1l7V4l+j/UHvxcdvNfLB9pPtIooHTbEhgD/6UGyh8Hy3Bm1Mj0buzjDXATCSz3JFibVdnoJZCrlUCanrQ== dependencies: - "@babel/compat-data" "^7.13.8" - "@babel/helper-compilation-targets" "^7.13.10" + "@babel/compat-data" "^7.14.0" + "@babel/helper-compilation-targets" "^7.13.16" "@babel/helper-plugin-utils" "^7.13.0" "@babel/helper-validator-option" "^7.12.17" - "@babel/plugin-proposal-async-generator-functions" "^7.13.8" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.13.12" + "@babel/plugin-proposal-async-generator-functions" "^7.13.15" "@babel/plugin-proposal-class-properties" "^7.13.0" + "@babel/plugin-proposal-class-static-block" "^7.13.11" "@babel/plugin-proposal-dynamic-import" "^7.13.8" "@babel/plugin-proposal-export-namespace-from" "^7.12.13" "@babel/plugin-proposal-json-strings" "^7.13.8" @@ -799,11 +781,13 @@ "@babel/plugin-proposal-numeric-separator" "^7.12.13" "@babel/plugin-proposal-object-rest-spread" "^7.13.8" "@babel/plugin-proposal-optional-catch-binding" "^7.13.8" - "@babel/plugin-proposal-optional-chaining" "^7.13.8" + "@babel/plugin-proposal-optional-chaining" "^7.13.12" "@babel/plugin-proposal-private-methods" "^7.13.0" + "@babel/plugin-proposal-private-property-in-object" "^7.14.0" "@babel/plugin-proposal-unicode-property-regex" "^7.12.13" "@babel/plugin-syntax-async-generators" "^7.8.4" "@babel/plugin-syntax-class-properties" "^7.12.13" + "@babel/plugin-syntax-class-static-block" "^7.12.13" "@babel/plugin-syntax-dynamic-import" "^7.8.3" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" "@babel/plugin-syntax-json-strings" "^7.8.3" @@ -813,14 +797,15 @@ "@babel/plugin-syntax-object-rest-spread" "^7.8.3" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" "@babel/plugin-syntax-optional-chaining" "^7.8.3" + "@babel/plugin-syntax-private-property-in-object" "^7.14.0" "@babel/plugin-syntax-top-level-await" "^7.12.13" "@babel/plugin-transform-arrow-functions" "^7.13.0" "@babel/plugin-transform-async-to-generator" "^7.13.0" "@babel/plugin-transform-block-scoped-functions" "^7.12.13" - "@babel/plugin-transform-block-scoping" "^7.12.13" + "@babel/plugin-transform-block-scoping" "^7.14.1" "@babel/plugin-transform-classes" "^7.13.0" "@babel/plugin-transform-computed-properties" "^7.13.0" - "@babel/plugin-transform-destructuring" "^7.13.0" + "@babel/plugin-transform-destructuring" "^7.13.17" "@babel/plugin-transform-dotall-regex" "^7.12.13" "@babel/plugin-transform-duplicate-keys" "^7.12.13" "@babel/plugin-transform-exponentiation-operator" "^7.12.13" @@ -828,16 +813,16 @@ "@babel/plugin-transform-function-name" "^7.12.13" "@babel/plugin-transform-literals" "^7.12.13" "@babel/plugin-transform-member-expression-literals" "^7.12.13" - "@babel/plugin-transform-modules-amd" "^7.13.0" - "@babel/plugin-transform-modules-commonjs" "^7.13.8" + "@babel/plugin-transform-modules-amd" "^7.14.0" + "@babel/plugin-transform-modules-commonjs" "^7.14.0" "@babel/plugin-transform-modules-systemjs" "^7.13.8" - "@babel/plugin-transform-modules-umd" "^7.13.0" + "@babel/plugin-transform-modules-umd" "^7.14.0" "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.13" "@babel/plugin-transform-new-target" "^7.12.13" "@babel/plugin-transform-object-super" "^7.12.13" "@babel/plugin-transform-parameters" "^7.13.0" "@babel/plugin-transform-property-literals" "^7.12.13" - "@babel/plugin-transform-regenerator" "^7.12.13" + "@babel/plugin-transform-regenerator" "^7.13.15" "@babel/plugin-transform-reserved-words" "^7.12.13" "@babel/plugin-transform-shorthand-properties" "^7.12.13" "@babel/plugin-transform-spread" "^7.13.0" @@ -847,10 +832,10 @@ "@babel/plugin-transform-unicode-escapes" "^7.12.13" "@babel/plugin-transform-unicode-regex" "^7.12.13" "@babel/preset-modules" "^0.1.4" - "@babel/types" "^7.13.0" - babel-plugin-polyfill-corejs2 "^0.1.4" - babel-plugin-polyfill-corejs3 "^0.1.3" - babel-plugin-polyfill-regenerator "^0.1.2" + "@babel/types" "^7.14.1" + babel-plugin-polyfill-corejs2 "^0.2.0" + babel-plugin-polyfill-corejs3 "^0.2.0" + babel-plugin-polyfill-regenerator "^0.2.0" core-js-compat "^3.9.0" semver "^6.3.0" @@ -866,9 +851,9 @@ esutils "^2.0.2" "@babel/runtime@^7.8.4": - version "7.13.7" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.7.tgz#d494e39d198ee9ca04f4dcb76d25d9d7a1dc961a" - integrity sha512-h+ilqoX998mRVM5FtB5ijRuHUDVt5l3yfoOi2uh18Z/O3hvyaHQ39NpxVkCIG5yFs+mLq/ewFp8Bss6zmWv6ZA== + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.0.tgz#46794bc20b612c5f75e62dd071e24dfd95f1cbe6" + integrity sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA== dependencies: regenerator-runtime "^0.13.4" @@ -881,28 +866,26 @@ "@babel/parser" "^7.12.13" "@babel/types" "^7.12.13" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.0.tgz#6d95752475f86ee7ded06536de309a65fc8966cc" - integrity sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ== +"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.15", "@babel/traverse@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.0.tgz#cea0dc8ae7e2b1dec65f512f39f3483e8cc95aef" + integrity sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA== dependencies: "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.13.0" + "@babel/generator" "^7.14.0" "@babel/helper-function-name" "^7.12.13" "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/parser" "^7.13.0" - "@babel/types" "^7.13.0" + "@babel/parser" "^7.14.0" + "@babel/types" "^7.14.0" debug "^4.1.0" globals "^11.1.0" - lodash "^4.17.19" -"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.0.tgz#74424d2816f0171b4100f0ab34e9a374efdf7f80" - integrity sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA== +"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.16", "@babel/types@^7.14.0", "@babel/types@^7.14.1", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": + version "7.14.1" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.1.tgz#095bd12f1c08ab63eff6e8f7745fa7c9cc15a9db" + integrity sha512-S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA== dependencies: - "@babel/helper-validator-identifier" "^7.12.11" - lodash "^4.17.19" + "@babel/helper-validator-identifier" "^7.14.0" to-fast-properties "^2.0.0" "@bcoe/v8-coverage@^0.2.3": @@ -923,10 +906,10 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz#8f03a22a04de437254e8ce8cc84ba39689288752" integrity sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg== -"@eslint/eslintrc@^0.4.0": - version "0.4.0" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547" - integrity sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog== +"@eslint/eslintrc@^0.4.1": + version "0.4.1" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.1.tgz#442763b88cecbe3ee0ec7ca6d6dd6168550cbf14" + integrity sha512-5v7TDE9plVhvxQeWLXDTvFvJBdH6pEsdnl2g/dAptmuFEPedQ4Erq5rsDsX+mvAM610IhNaO2W5V1dOOnDKxkQ== dependencies: ajv "^6.12.4" debug "^4.1.1" @@ -1138,9 +1121,9 @@ uid "" "@msgpack/msgpack@^2.4.0": - version "2.4.0" - resolved "https://registry.yarnpkg.com/@msgpack/msgpack/-/msgpack-2.4.0.tgz#789c69301388a6a44a47ce654014ecd1703c8fcc" - integrity sha512-5qzv53J43V8GaYsaETs29Q0Ehw9Dog6SG18MASZRQDuZYXtA5T7pymGE2S40NL0X8sjl8+TybmRa5O8d45V7MQ== + version "2.6.3" + resolved "https://registry.yarnpkg.com/@msgpack/msgpack/-/msgpack-2.6.3.tgz#e0e3cdac43500624ee5a0f2f2503351d5862e46c" + integrity sha512-dSJ1TBB9Hreienm5SFVbpKIcRRekQNULxvbmDVXQwRCZWYCIxZ23X+FlFWkg1LmGG+DIQZXH+2IW01QwxofT/g== "@nodelib/fs.scandir@2.1.4": version "2.1.4" @@ -1164,9 +1147,9 @@ fastq "^1.6.0" "@sinonjs/commons@^1.7.0": - version "1.8.2" - resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.2.tgz#858f5c4b48d80778fde4b9d541f27edc0d56488b" - integrity sha512-sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw== + version "1.8.3" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d" + integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ== dependencies: type-detect "4.0.8" @@ -1178,9 +1161,9 @@ "@sinonjs/commons" "^1.7.0" "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7": - version "7.1.12" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz#4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d" - integrity sha512-wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ== + version "7.1.14" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.14.tgz#faaeefc4185ec71c389f4501ee5ec84b170cc402" + integrity sha512-zGZJzzBUVDo/eV6KgbE0f0ZI7dInEYvo12Rb70uNQDshC3SkRMb67ja0GgRHZgAX3Za6rhaWlvbDO8rrGyAb1g== dependencies: "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" @@ -1204,9 +1187,9 @@ "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": - version "7.11.0" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.0.tgz#b9a1efa635201ba9bc850323a8793ee2d36c04a0" - integrity sha512-kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg== + version "7.11.1" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.1.tgz#654f6c4f67568e24c23b367e947098c6206fa639" + integrity sha512-Vs0hm0vPahPMYi9tDjtP66llufgO3ST16WXaSTtDGEl9cewAl3AibmxWw6TINOqHPT9z0uABKAYjT9jNSg4npw== dependencies: "@babel/types" "^7.3.0" @@ -1224,17 +1207,17 @@ "@types/estree" "*" "@types/eslint@*": - version "7.2.6" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.6.tgz#5e9aff555a975596c03a98b59ecd103decc70c3c" - integrity sha512-I+1sYH+NPQ3/tVqCeUSBwTE/0heyvtXqpIopUUArlBm0Kpocb8FbMa3AZ/ASKIFpN3rnEx932TTXDbt9OXsNDw== + version "7.2.10" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.10.tgz#4b7a9368d46c0f8cd5408c23288a59aa2394d917" + integrity sha512-kUEPnMKrqbtpCq/KTaGFFKAcz6Ethm2EjCoKIDaCmfRBWLbFuTcOJfTlorwbnboXBzahqWLgUp1BQeKHiJzPUQ== dependencies: "@types/estree" "*" "@types/json-schema" "*" -"@types/estree@*", "@types/estree@^0.0.46": - version "0.0.46" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.46.tgz#0fb6bfbbeabd7a30880504993369c4bf1deab1fe" - integrity sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg== +"@types/estree@*", "@types/estree@^0.0.47": + version "0.0.47" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.47.tgz#d7a51db20f0650efec24cd04994f523d93172ed4" + integrity sha512-c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg== "@types/graceful-fs@^4.1.2": version "4.1.5" @@ -1263,17 +1246,17 @@ "@types/istanbul-lib-report" "*" "@types/jest@^26.0.20": - version "26.0.20" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.20.tgz#cd2f2702ecf69e86b586e1f5223a60e454056307" - integrity sha512-9zi2Y+5USJRxd0FsahERhBwlcvFh6D2GLQnY2FH2BzK8J9s9omvNHIbvABwIluXa0fD8XVKMLTO0aOEuUfACAA== + version "26.0.23" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.23.tgz#a1b7eab3c503b80451d019efb588ec63522ee4e7" + integrity sha512-ZHLmWMJ9jJ9PTiT58juykZpL7KjwJywFN3Rr2pTSkyQfydf/rk22yS7W8p5DaVUMQ2BQC7oYiU3FjbTM/mYrOA== dependencies: jest-diff "^26.0.0" pretty-format "^26.0.0" "@types/jsdom@^16.2.7": - version "16.2.7" - resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-16.2.7.tgz#27d2f77d655a3db15f7c3f104f1a6d15e3112938" - integrity sha512-jJ0QDvwZxAO+SninBaQdW6najEs1dCZ1uMsXFBTitwfAtz+0wfDZWd3GFEqkL4flD3IefB+VGBcrN9HbRdAdog== + version "16.2.10" + resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-16.2.10.tgz#c05ea94682d035943ae2453b79d56178496b6653" + integrity sha512-q3aIjp3ehhVSXSbvNyuireAfvU2umRiZ2aLumyeZewCnoNaokrRDdTu5IvaeE9pzNtWHXrUnM9lb22Vl3W08EA== dependencies: "@types/node" "*" "@types/parse5" "*" @@ -1285,9 +1268,9 @@ integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA== "@types/node@*": - version "14.14.31" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.31.tgz#72286bd33d137aa0d152d47ec7c1762563d34055" - integrity sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g== + version "15.0.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz#51e9c0920d1b45936ea04341aa3e2e58d339fb67" + integrity sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA== "@types/normalize-package-data@^2.4.0": version "2.4.0" @@ -1300,9 +1283,9 @@ integrity sha512-oPwPSj4a1wu9rsXTEGIJz91ISU725t0BmSnUhb57sI+M8XEmvUop84lzuiYdq0Y5M6xLY8DBPg0C2xEQKLyvBA== "@types/prettier@^2.0.0": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.1.tgz#374e31645d58cb18a07b3ecd8e9dede4deb2cccd" - integrity sha512-DxZZbyMAM9GWEzXL+BMZROWz9oo6A9EilwwOMET2UVu2uZTqMWS5S69KVtuVKaRjCUpcrOXRalet86/OpG4kqw== + version "2.2.3" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.3.tgz#ef65165aea2924c9359205bf748865b8881753c0" + integrity sha512-PijRCG/K3s3w1We6ynUKdxEc5AcuuH3NBmMDP8uvKVp6X43UY7NQlTzczakXP3DJR0F4dfNQIGjU2cUeRYs2AA== "@types/stack-utils@^2.0.0": version "2.0.0" @@ -1327,12 +1310,12 @@ "@types/yargs-parser" "*" "@typescript-eslint/eslint-plugin@^4.17.0": - version "4.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.17.0.tgz#6f856eca4e6a52ce9cf127dfd349096ad936aa2d" - integrity sha512-/fKFDcoHg8oNan39IKFOb5WmV7oWhQe1K6CDaAVfJaNWEhmfqlA24g+u1lqU5bMH7zuNasfMId4LaYWC5ijRLw== + version "4.23.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.23.0.tgz#29d3c9c81f6200b1fd6d8454cfb007ba176cde80" + integrity sha512-tGK1y3KIvdsQEEgq6xNn1DjiFJtl+wn8JJQiETtCbdQxw1vzjXyAaIkEmO2l6Nq24iy3uZBMFQjZ6ECf1QdgGw== dependencies: - "@typescript-eslint/experimental-utils" "4.17.0" - "@typescript-eslint/scope-manager" "4.17.0" + "@typescript-eslint/experimental-utils" "4.23.0" + "@typescript-eslint/scope-manager" "4.23.0" debug "^4.1.1" functional-red-black-tree "^1.0.1" lodash "^4.17.15" @@ -1340,60 +1323,60 @@ semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@4.17.0": - version "4.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.17.0.tgz#762c44aaa1a6a3c05b6d63a8648fb89b89f84c80" - integrity sha512-ZR2NIUbnIBj+LGqCFGQ9yk2EBQrpVVFOh9/Kd0Lm6gLpSAcCuLLe5lUCibKGCqyH9HPwYC0GIJce2O1i8VYmWA== +"@typescript-eslint/experimental-utils@4.23.0": + version "4.23.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.23.0.tgz#f2059434cd6e5672bfeab2fb03b7c0a20622266f" + integrity sha512-WAFNiTDnQfrF3Z2fQ05nmCgPsO5o790vOhmWKXbbYQTO9erE1/YsFot5/LnOUizLzU2eeuz6+U/81KV5/hFTGA== dependencies: "@types/json-schema" "^7.0.3" - "@typescript-eslint/scope-manager" "4.17.0" - "@typescript-eslint/types" "4.17.0" - "@typescript-eslint/typescript-estree" "4.17.0" + "@typescript-eslint/scope-manager" "4.23.0" + "@typescript-eslint/types" "4.23.0" + "@typescript-eslint/typescript-estree" "4.23.0" eslint-scope "^5.0.0" eslint-utils "^2.0.0" "@typescript-eslint/parser@^4.17.0": - version "4.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.17.0.tgz#141b647ffc72ebebcbf9b0fe6087f65b706d3215" - integrity sha512-KYdksiZQ0N1t+6qpnl6JeK9ycCFprS9xBAiIrw4gSphqONt8wydBw4BXJi3C11ywZmyHulvMaLjWsxDjUSDwAw== + version "4.23.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.23.0.tgz#239315d38e42e852bef43a4b0b01bef78f78911c" + integrity sha512-wsvjksHBMOqySy/Pi2Q6UuIuHYbgAMwLczRl4YanEPKW5KVxI9ZzDYh3B5DtcZPQTGRWFJrfcbJ6L01Leybwug== dependencies: - "@typescript-eslint/scope-manager" "4.17.0" - "@typescript-eslint/types" "4.17.0" - "@typescript-eslint/typescript-estree" "4.17.0" + "@typescript-eslint/scope-manager" "4.23.0" + "@typescript-eslint/types" "4.23.0" + "@typescript-eslint/typescript-estree" "4.23.0" debug "^4.1.1" -"@typescript-eslint/scope-manager@4.17.0": - version "4.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.17.0.tgz#f4edf94eff3b52a863180f7f89581bf963e3d37d" - integrity sha512-OJ+CeTliuW+UZ9qgULrnGpPQ1bhrZNFpfT/Bc0pzNeyZwMik7/ykJ0JHnQ7krHanFN9wcnPK89pwn84cRUmYjw== +"@typescript-eslint/scope-manager@4.23.0": + version "4.23.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.23.0.tgz#8792ef7eacac122e2ec8fa2d30a59b8d9a1f1ce4" + integrity sha512-ZZ21PCFxPhI3n0wuqEJK9omkw51wi2bmeKJvlRZPH5YFkcawKOuRMQMnI8mH6Vo0/DoHSeZJnHiIx84LmVQY+w== dependencies: - "@typescript-eslint/types" "4.17.0" - "@typescript-eslint/visitor-keys" "4.17.0" + "@typescript-eslint/types" "4.23.0" + "@typescript-eslint/visitor-keys" "4.23.0" -"@typescript-eslint/types@4.17.0": - version "4.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.17.0.tgz#f57d8fc7f31b348db946498a43050083d25f40ad" - integrity sha512-RN5z8qYpJ+kXwnLlyzZkiJwfW2AY458Bf8WqllkondQIcN2ZxQowAToGSd9BlAUZDB5Ea8I6mqL2quGYCLT+2g== +"@typescript-eslint/types@4.23.0": + version "4.23.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.23.0.tgz#da1654c8a5332f4d1645b2d9a1c64193cae3aa3b" + integrity sha512-oqkNWyG2SLS7uTWLZf6Sr7Dm02gA5yxiz1RP87tvsmDsguVATdpVguHr4HoGOcFOpCvx9vtCSCyQUGfzq28YCw== -"@typescript-eslint/typescript-estree@4.17.0": - version "4.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.17.0.tgz#b835d152804f0972b80dbda92477f9070a72ded1" - integrity sha512-lRhSFIZKUEPPWpWfwuZBH9trYIEJSI0vYsrxbvVvNyIUDoKWaklOAelsSkeh3E2VBSZiNe9BZ4E5tYBZbUczVQ== +"@typescript-eslint/typescript-estree@4.23.0": + version "4.23.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.23.0.tgz#0753b292097523852428a6f5a1aa8ccc1aae6cd9" + integrity sha512-5Sty6zPEVZF5fbvrZczfmLCOcby3sfrSPu30qKoY1U3mca5/jvU5cwsPb/CO6Q3ByRjixTMIVsDkqwIxCf/dMw== dependencies: - "@typescript-eslint/types" "4.17.0" - "@typescript-eslint/visitor-keys" "4.17.0" + "@typescript-eslint/types" "4.23.0" + "@typescript-eslint/visitor-keys" "4.23.0" debug "^4.1.1" globby "^11.0.1" is-glob "^4.0.1" semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/visitor-keys@4.17.0": - version "4.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.17.0.tgz#9c304cfd20287c14a31d573195a709111849b14d" - integrity sha512-WfuMN8mm5SSqXuAr9NM+fItJ0SVVphobWYkWOwQ1odsfC014Vdxk/92t4JwS1Q6fCA/ABfCKpa3AVtpUKTNKGQ== +"@typescript-eslint/visitor-keys@4.23.0": + version "4.23.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.23.0.tgz#7215cc977bd3b4ef22467b9023594e32f9e4e455" + integrity sha512-5PNe5cmX9pSifit0H+nPoQBXdbNzi5tOEec+3riK+ku4e3er37pKxMKDH5Ct5Y4fhWxcD4spnlYjxi9vXbSpwg== dependencies: - "@typescript-eslint/types" "4.17.0" + "@typescript-eslint/types" "4.23.0" eslint-visitor-keys "^2.0.0" "@webassemblyjs/ast@1.11.0": @@ -1517,22 +1500,22 @@ "@webassemblyjs/ast" "1.11.0" "@xtuc/long" "4.2.2" -"@webpack-cli/configtest@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.1.tgz#241aecfbdc715eee96bed447ed402e12ec171935" - integrity sha512-B+4uBUYhpzDXmwuo3V9yBH6cISwxEI4J+NO5ggDaGEEHb0osY/R7MzeKc0bHURXQuZjMM4qD+bSJCKIuI3eNBQ== +"@webpack-cli/configtest@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.3.tgz#204bcff87cda3ea4810881f7ea96e5f5321b87b9" + integrity sha512-WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw== -"@webpack-cli/info@^1.2.2": - version "1.2.2" - resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.2.tgz#ef3c0cd947a1fa083e174a59cb74e0b6195c236c" - integrity sha512-5U9kUJHnwU+FhKH4PWGZuBC1hTEPYyxGSL5jjoBI96Gx8qcYJGOikpiIpFoTq8mmgX3im2zAo2wanv/alD74KQ== +"@webpack-cli/info@^1.2.4": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.4.tgz#7381fd41c9577b2d8f6c2594fad397ef49ad5573" + integrity sha512-ogE2T4+pLhTTPS/8MM3IjHn0IYplKM4HbVNMCWA9N4NrdPzunwenpCsqKEXyejMfRu6K8mhauIPYf8ZxWG5O6g== dependencies: envinfo "^7.7.3" -"@webpack-cli/serve@^1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.3.0.tgz#2730c770f5f1f132767c63dcaaa4ec28f8c56a6c" - integrity sha512-k2p2VrONcYVX1wRRrf0f3X2VGltLWcv+JzXRBDmvCxGlCeESx4OXw91TsWeKOkp784uNoVQo313vxJFHXPPwfw== +"@webpack-cli/serve@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.4.0.tgz#f84fd07bcacefe56ce762925798871092f0f228e" + integrity sha512-xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg== "@xtuc/ieee754@^1.2.0": version "1.2.0" @@ -1544,7 +1527,7 @@ resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== -abab@^2.0.3: +abab@^2.0.3, abab@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q== @@ -1579,10 +1562,10 @@ acorn@^7.1.1, acorn@^7.4.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.0.4: - version "8.0.5" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.0.5.tgz#a3bfb872a74a6a7f661bc81b9849d9cac12601b7" - integrity sha512-v+DieK/HJkJOpFBETDJioequtc3PfxsWMaxIdIwujtF7FEV/MAyDQLlm6/zPvr7Mix07mLh6ccVwIsloceodlg== +acorn@^8.1.0, acorn@^8.2.1: + version "8.2.4" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.4.tgz#caba24b08185c3b56e3168e97d15ed17f4d31fd0" + integrity sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg== ajv-keywords@^3.5.2: version "3.5.2" @@ -1599,10 +1582,10 @@ ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^7.0.2: - version "7.1.1" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.1.1.tgz#1e6b37a454021fa9941713f38b952fc1c8d32a84" - integrity sha512-ga/aqDYnUy/o7vbsRTFhhTsNeXiYb5JWDIcRIeZfwRNCefwjNTVYCGdGSUrEmiu3yDK3vFvNbgJxvrQW4JXrYQ== +ajv@^8.0.1: + version "8.3.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.3.0.tgz#25ee7348e32cdc4a1dbb38256bf6bdc451dd577c" + integrity sha512-RYE7B5An83d7eWnDR8kbdaIFqmKCNsP16ay1hDbJEU+sa0e3H9SebskCt0Uufem6cfAVu7Col6ubcn/W+Sm8/Q== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -1615,11 +1598,11 @@ ansi-colors@^4.1.1: integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== ansi-escapes@^4.2.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61" - integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA== + version "4.3.2" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" + integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== dependencies: - type-fest "^0.11.0" + type-fest "^0.21.3" ansi-regex@^5.0.0: version "5.0.0" @@ -1649,9 +1632,9 @@ anymatch@^2.0.0: normalize-path "^2.1.1" anymatch@^3.0.3: - version "3.1.1" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" - integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== + version "3.1.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== dependencies: normalize-path "^3.0.0" picomatch "^2.0.4" @@ -1772,29 +1755,29 @@ babel-plugin-jest-hoist@^26.6.2: "@types/babel__core" "^7.0.0" "@types/babel__traverse" "^7.0.6" -babel-plugin-polyfill-corejs2@^0.1.4: - version "0.1.6" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.1.6.tgz#947a1227efa1a14ce09ac5fafc66ce8e039071e2" - integrity sha512-1PfghLDuzX5lFY6XXO0hrfxwYf0LD9YajMWeQBGNaPNLQ35paV7YB4hlFW+HfwFS5kcp4rtPI/237xLfQ1ah8A== +babel-plugin-polyfill-corejs2@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.0.tgz#686775bf9a5aa757e10520903675e3889caeedc4" + integrity sha512-9bNwiR0dS881c5SHnzCmmGlMkJLl0OUZvxrxHo9w/iNoRuqaPjqlvBf4HrovXtQs/au5yKkpcdgfT1cC5PAZwg== dependencies: - "@babel/compat-data" "^7.13.0" - "@babel/helper-define-polyfill-provider" "^0.1.2" + "@babel/compat-data" "^7.13.11" + "@babel/helper-define-polyfill-provider" "^0.2.0" semver "^6.1.1" -babel-plugin-polyfill-corejs3@^0.1.3: - version "0.1.4" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.4.tgz#2ae290200e953bade30907b7a3bebcb696e6c59d" - integrity sha512-ysSzFn/qM8bvcDAn4mC7pKk85Y5dVaoa9h4u0mHxOEpDzabsseONhUpR7kHxpUinfj1bjU7mUZqD23rMZBoeSg== +babel-plugin-polyfill-corejs3@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.0.tgz#f4b4bb7b19329827df36ff56f6e6d367026cb7a2" + integrity sha512-zZyi7p3BCUyzNxLx8KV61zTINkkV65zVkDAFNZmrTCRVhjo1jAS+YLvDJ9Jgd/w2tsAviCwFHReYfxO3Iql8Yg== dependencies: - "@babel/helper-define-polyfill-provider" "^0.1.2" - core-js-compat "^3.8.1" + "@babel/helper-define-polyfill-provider" "^0.2.0" + core-js-compat "^3.9.1" -babel-plugin-polyfill-regenerator@^0.1.2: - version "0.1.3" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.1.3.tgz#350f857225fc640ae1ec78d1536afcbb457db841" - integrity sha512-hRjTJQiOYt/wBKEc+8V8p9OJ9799blAJcuKzn1JXh3pApHoWl1Emxh2BHc6MC7Qt6bbr3uDpNxaYQnATLIudEg== +babel-plugin-polyfill-regenerator@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.0.tgz#853f5f5716f4691d98c84f8069c7636ea8da7ab8" + integrity sha512-J7vKbCuD2Xi/eEHxquHN14bXAW9CXtecwuLrOIDJtcZzTaPzV1VdEfoUf9AzcRBMolKUQKM9/GVojeh0hFiqMg== dependencies: - "@babel/helper-define-polyfill-provider" "^0.1.2" + "@babel/helper-define-polyfill-provider" "^0.2.0" babel-preset-current-node-syntax@^1.0.0: version "1.0.1" @@ -1823,9 +1806,9 @@ babel-preset-jest@^26.6.2: babel-preset-current-node-syntax "^1.0.0" balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== base@^0.11.1: version "0.11.2" @@ -1888,16 +1871,16 @@ browser-process-hrtime@^1.0.0: resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== -browserslist@^4.14.5, browserslist@^4.16.3: - version "4.16.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz#340aa46940d7db878748567c5dea24a48ddf3717" - integrity sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw== +browserslist@^4.14.5, browserslist@^4.16.6: + version "4.16.6" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2" + integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ== dependencies: - caniuse-lite "^1.0.30001181" - colorette "^1.2.1" - electron-to-chromium "^1.3.649" + caniuse-lite "^1.0.30001219" + colorette "^1.2.2" + electron-to-chromium "^1.3.723" escalade "^3.1.1" - node-releases "^1.1.70" + node-releases "^1.1.71" bs-logger@0.x: version "0.2.6" @@ -1956,10 +1939,10 @@ camelcase@^6.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== -caniuse-lite@^1.0.30001181: - version "1.0.30001191" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001191.tgz#bacb432b6701f690c8c5f7c680166b9a9f0843d9" - integrity sha512-xJJqzyd+7GCJXkcoBiQ1GuxEiOBCLQ0aVW9HMekifZsAVGdj5eJ4mFB9fEhSHipq9IOk/QXFJUiIr9lZT+EsGw== +caniuse-lite@^1.0.30001219: + version "1.0.30001228" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa" + integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A== capture-exit@^2.0.0: version "2.0.0" @@ -1983,9 +1966,9 @@ chalk@^2.0.0: supports-color "^5.3.0" chalk@^4.0.0, chalk@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" - integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== + version "4.1.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" + integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" @@ -1996,11 +1979,9 @@ char-regex@^1.0.2: integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== chrome-trace-event@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4" - integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ== - dependencies: - tslib "^1.9.0" + version "1.0.3" + resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" + integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== ci-info@^2.0.0: version "2.0.0" @@ -2091,10 +2072,10 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -colorette@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b" - integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw== +colorette@^1.2.1, colorette@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" + integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== combined-stream@^1.0.6, combined-stream@~1.0.6: version "1.0.8" @@ -2109,9 +2090,9 @@ commander@^2.20.0: integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== commander@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-7.1.0.tgz#f2eaecf131f10e36e07d894698226e36ae0eb5ff" - integrity sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg== + version "7.2.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" + integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== component-emitter@^1.2.1: version "1.3.0" @@ -2135,12 +2116,12 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -core-js-compat@^3.8.1, core-js-compat@^3.9.0: - version "3.9.0" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.9.0.tgz#29da39385f16b71e1915565aa0385c4e0963ad56" - integrity sha512-YK6fwFjCOKWwGnjFUR3c544YsnA/7DoLL0ysncuOJ4pwbriAtOpvM2bygdlcXbvQCQZ7bBU9CL4t7tGl7ETRpQ== +core-js-compat@^3.9.0, core-js-compat@^3.9.1: + version "3.12.1" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.12.1.tgz#2c302c4708505fa7072b0adb5156d26f7801a18b" + integrity sha512-i6h5qODpw6EsHAoIdQhKoZdWn+dGBF3dSS8m5tif36RlWvW3A6+yu2S16QHUo3CrkzrnEskMAt9f8FxmY9fhWQ== dependencies: - browserslist "^4.16.3" + browserslist "^4.16.6" semver "7.0.0" core-util-is@1.0.2, core-util-is@~1.0.0: @@ -2178,7 +2159,7 @@ cssom@~0.3.6: resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== -cssstyle@^2.2.0: +cssstyle@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852" integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A== @@ -2220,7 +2201,7 @@ decamelize@^1.2.0: resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= -decimal.js@^10.2.0: +decimal.js@^10.2.1: version "10.2.1" resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz#238ae7b0f0c793d3e3cea410108b35a2c01426a3" integrity sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw== @@ -2313,10 +2294,10 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" safer-buffer "^2.1.0" -electron-to-chromium@^1.3.649: - version "1.3.673" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.673.tgz#b4f81c930b388f962b7eba20d0483299aaa40913" - integrity sha512-ms+QR2ckfrrpEAjXweLx6kNCbpAl66DcW//3BZD4BV5KhUgr0RZRce1ON/9J3QyA3JO28nzgb5Xv8DnPr05ILg== +electron-to-chromium@^1.3.723: + version "1.3.727" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz#857e310ca00f0b75da4e1db6ff0e073cc4a91ddf" + integrity sha512-Mfz4FIB4FSvEwBpDfdipRIrwd6uo8gUDoRDF4QEYb4h4tSuI3ov594OrjU6on042UlFHouIJpClDODGkPcBSbg== emittery@^0.7.1: version "0.7.2" @@ -2349,15 +2330,15 @@ enhanced-resolve@^4.0.0: memory-fs "^0.5.0" tapable "^1.0.0" -enhanced-resolve@^5.7.0: - version "5.7.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz#525c5d856680fbd5052de453ac83e32049958b5c" - integrity sha512-6njwt/NsZFUKhM6j9U8hzVyD4E4r0x7NQzhTCbcWOJ0IQjNSAoalWmb0AE51Wn+fwan5qVESWi7t2ToBxs9vrw== +enhanced-resolve@^5.8.0: + version "5.8.2" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz#15ddc779345cbb73e97c611cd00c01c1e7bf4d8b" + integrity sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" -enquirer@^2.3.5, enquirer@^2.3.6: +enquirer@^2.3.5: version "2.3.6" resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== @@ -2365,9 +2346,9 @@ enquirer@^2.3.5, enquirer@^2.3.6: ansi-colors "^4.1.1" envinfo@^7.7.3: - version "7.7.4" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.7.4.tgz#c6311cdd38a0e86808c1c9343f667e4267c4a320" - integrity sha512-TQXTYFVVwwluWSFis6K2XKxgrD22jEv0FTuLCQI+OjH7rn93+iY0fSSFM5lrSxFY+H1+B0/cvvlamr3UsBivdQ== + version "7.8.1" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" + integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== errno@^0.1.3: version "0.1.8" @@ -2384,9 +2365,9 @@ error-ex@^1.3.1: is-arrayish "^0.2.1" es-module-lexer@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.4.0.tgz#21f4181cc8b7eee06855f1c59e6087c7bc4f77b0" - integrity sha512-iuEGihqqhKWFgh72Q/Jtch7V2t/ft8w8IPP2aEN8ArYKO+IWyo6hsi96hCdgyeEDQIV3InhYQ9BlwUFPGXrbEQ== + version "0.4.1" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.4.1.tgz#dda8c6a14d8f340a24e34331e0fab0cb50438e0e" + integrity sha512-ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA== escalade@^3.1.1: version "3.1.1" @@ -2403,13 +2384,13 @@ escape-string-regexp@^2.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== -escodegen@^1.14.1: - version "1.14.3" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503" - integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw== +escodegen@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" + integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw== dependencies: esprima "^4.0.1" - estraverse "^4.2.0" + estraverse "^5.2.0" esutils "^2.0.2" optionator "^0.8.1" optionalDependencies: @@ -2436,17 +2417,17 @@ eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== eslint-visitor-keys@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" - integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== eslint@^7.21.0: - version "7.21.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.21.0.tgz#4ecd5b8c5b44f5dedc9b8a110b01bbfeb15d1c83" - integrity sha512-W2aJbXpMNofUp0ztQaF40fveSsJBjlSCSWpy//gzfTvwC+USs/nceBrKmlJOiM8r1bLwP2EuYkCqArn/6QTIgg== + version "7.26.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.26.0.tgz#d416fdcdcb3236cd8f282065312813f8c13982f6" + integrity sha512-4R1ieRf52/izcZE7AlLy56uIHHDLT74Yzz2Iv2l6kDaYvEu9x+wMB5dZArVL8SYGXSYV2YAg70FcW5Y5nGGNIg== dependencies: "@babel/code-frame" "7.12.11" - "@eslint/eslintrc" "^0.4.0" + "@eslint/eslintrc" "^0.4.1" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" @@ -2462,7 +2443,7 @@ eslint@^7.21.0: file-entry-cache "^6.0.1" functional-red-black-tree "^1.0.1" glob-parent "^5.0.0" - globals "^12.1.0" + globals "^13.6.0" ignore "^4.0.6" import-fresh "^3.0.0" imurmurhash "^0.1.4" @@ -2470,7 +2451,7 @@ eslint@^7.21.0: js-yaml "^3.13.1" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" - lodash "^4.17.20" + lodash "^4.17.21" minimatch "^3.0.4" natural-compare "^1.4.0" optionator "^0.9.1" @@ -2511,7 +2492,7 @@ esrecurse@^4.3.0: dependencies: estraverse "^5.2.0" -estraverse@^4.1.1, estraverse@^4.2.0: +estraverse@^4.1.1: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== @@ -2532,21 +2513,21 @@ event-target-shim@^5.0.0: integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ== events@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379" - integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg== + version "3.3.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== eventsource@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0" - integrity sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ== + version "1.1.0" + resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.0.tgz#00e8ca7c92109e94b0ddf32dac677d841028cfaf" + integrity sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg== dependencies: original "^1.0.0" exec-sh@^0.3.2: - version "0.3.4" - resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5" - integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A== + version "0.3.6" + resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc" + integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w== execa@^1.0.0: version "1.0.0" @@ -2783,9 +2764,9 @@ form-data@~2.3.2: mime-types "^2.1.12" fp-ts@^2.6.1: - version "2.9.5" - resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-2.9.5.tgz#6690cd8b76b84214a38fc77cbbbd04a38f86ea90" - integrity sha512-MiHrA5teO6t8zKArE3DdMPT/Db6v2GUt5yfWnhBTrrsVfeCJUUnV6sgFvjGNBKDmEMqVwRFkEePL7wPwqrLKKA== + version "2.10.5" + resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-2.10.5.tgz#7c77868fe8bd9b229743303c1bec505b959f631b" + integrity sha512-X2KfTIV0cxIk3d7/2Pvp/pxL/xr2MV1WooyEzKtTWYSc1+52VF4YzjBTXqeOlSiZsPCxIBpDGfT9Dyo7WEY0DQ== fragment-cache@^0.2.1: version "0.2.1" @@ -2853,9 +2834,9 @@ get-stream@^5.0.0: pump "^3.0.0" get-stream@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.0.tgz#3e0012cb6827319da2706e601a1583e8629a6718" - integrity sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg== + version "6.0.1" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" + integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" @@ -2870,9 +2851,9 @@ getpass@^0.1.1: assert-plus "^1.0.0" glob-parent@^5.0.0, glob-parent@^5.1.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229" - integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ== + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== dependencies: is-glob "^4.0.1" @@ -2882,9 +2863,9 @@ glob-to-regexp@^0.4.1: integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: - version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + version "7.1.7" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" + integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -2905,10 +2886,17 @@ globals@^12.1.0: dependencies: type-fest "^0.8.1" +globals@^13.6.0: + version "13.8.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz#3e20f504810ce87a8d72e55aecf8435b50f4c1b3" + integrity sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q== + dependencies: + type-fest "^0.20.2" + globby@^11.0.1: - version "11.0.2" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.2.tgz#1af538b766a3b540ebfb58a32b2e2d5897321d83" - integrity sha512-2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og== + version "11.0.3" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb" + integrity sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg== dependencies: array-union "^2.1.0" dir-glob "^3.0.1" @@ -2951,9 +2939,9 @@ has-flag@^4.0.0: integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== has-symbols@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" - integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" + integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== has-value@^0.3.1: version "0.3.1" @@ -2994,9 +2982,9 @@ has@^1.0.3: function-bind "^1.1.1" hosted-git-info@^2.1.4: - version "2.8.8" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" - integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg== + version "2.8.9" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" + integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== html-encoding-sniffer@^2.0.1: version "2.0.1" @@ -3081,9 +3069,9 @@ inherits@2, inherits@~2.0.3: integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== inspectpack@^4.6.1: - version "4.6.1" - resolved "https://registry.yarnpkg.com/inspectpack/-/inspectpack-4.6.1.tgz#96ce22220fda63ce166d4e2b2d94b4bf6065abc9" - integrity sha512-0TyiQzY2MTr7sFKAZUWm8TPx40/bjvlaqbqJHW+FHUbzUJ4p6EBJEndoZW01IacJd37eMBQJy/uw3k0LqRMOhg== + version "4.7.1" + resolved "https://registry.yarnpkg.com/inspectpack/-/inspectpack-4.7.1.tgz#baf081bae0b5b31bbedd534424e658f32d60f97a" + integrity sha512-XoDJbKSM9I2KA+8+OLFJHm8m4NM2pMEgsDD2hze6swVfynEed9ngCx36mRR+otzOsskwnxIZWXjI23FTW1uHqA== dependencies: chalk "^4.1.0" fp-ts "^2.6.1" @@ -3104,14 +3092,9 @@ io-ts-reporters@^1.2.2: integrity sha512-igASwWWkDY757OutNcM6zTtdJf/eTZYkoe2ymsX2qpm5bKZLo74FJYjsCtMQOEdY7dRHLLEulCyFQwdN69GBCg== io-ts@^2.2.13: - version "2.2.15" - resolved "https://registry.yarnpkg.com/io-ts/-/io-ts-2.2.15.tgz#0b0b19a6f8a64f4a524ad5810d56432789428128" - integrity sha512-ww2ZPrErx5pjCCI/tWRwjlEIDEndnN9kBIxAylXj+WNIH4ZVgaUqFuabGouehkRuvrmvzO5OnZmLf+o50h4izQ== - -ip-regex@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" - integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk= + version "2.2.16" + resolved "https://registry.yarnpkg.com/io-ts/-/io-ts-2.2.16.tgz#597dffa03db1913fc318c9c6df6931cb4ed808b2" + integrity sha512-y5TTSa6VP6le0hhmIyN0dqEXkrZeJLeC5KApJq6VLci3UEKF80lZ+KuoUs02RhBxNWlrqSNxzfI7otLX1Euv8Q== is-accessor-descriptor@^0.1.6: version "0.1.6" @@ -3145,9 +3128,9 @@ is-ci@^2.0.0: ci-info "^2.0.0" is-core-module@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a" - integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ== + version "2.4.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz#8e9fc8e15027b011418026e98f0e6f4d86305cc1" + integrity sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A== dependencies: has "^1.0.3" @@ -3184,9 +3167,9 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2: kind-of "^6.0.2" is-docker@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156" - integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw== + version "2.2.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" @@ -3242,9 +3225,9 @@ is-plain-object@^2.0.4: isobject "^3.0.1" is-potential-custom-element-name@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397" - integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c= + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" + integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== is-stream@^1.1.0: version "1.1.0" @@ -3733,35 +3716,35 @@ jsbn@~0.1.0: integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= jsdom@^16.4.0: - version "16.4.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz#36005bde2d136f73eee1a830c6d45e55408edddb" - integrity sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w== + version "16.5.3" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.3.tgz#13a755b3950eb938b4482c407238ddf16f0d2136" + integrity sha512-Qj1H+PEvUsOtdPJ056ewXM4UJPCi4hhLA8wpiz9F2YvsRBhuFsXxtrIFAgGBDynQA9isAMGE91PfUYbdMPXuTA== dependencies: - abab "^2.0.3" - acorn "^7.1.1" + abab "^2.0.5" + acorn "^8.1.0" acorn-globals "^6.0.0" cssom "^0.4.4" - cssstyle "^2.2.0" + cssstyle "^2.3.0" data-urls "^2.0.0" - decimal.js "^10.2.0" + decimal.js "^10.2.1" domexception "^2.0.1" - escodegen "^1.14.1" + escodegen "^2.0.0" html-encoding-sniffer "^2.0.1" is-potential-custom-element-name "^1.0.0" nwsapi "^2.2.0" - parse5 "5.1.1" + parse5 "6.0.1" request "^2.88.2" - request-promise-native "^1.0.8" - saxes "^5.0.0" + request-promise-native "^1.0.9" + saxes "^5.0.1" symbol-tree "^3.2.4" - tough-cookie "^3.0.1" + tough-cookie "^4.0.0" w3c-hr-time "^1.0.2" w3c-xmlserializer "^2.0.0" webidl-conversions "^6.1.0" whatwg-encoding "^1.0.5" whatwg-mimetype "^2.3.0" - whatwg-url "^8.0.0" - ws "^7.2.3" + whatwg-url "^8.5.0" + ws "^7.4.4" xml-name-validator "^3.0.0" jsesc@^2.5.1: @@ -3902,17 +3885,22 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" +lodash.clonedeep@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" + integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= + lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= -lodash.sortby@^4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" - integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= +lodash.truncate@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" + integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= -lodash@4.x, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20: +lodash@4.x, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.7.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -3993,24 +3981,24 @@ micromatch@^3.1.4: to-regex "^3.0.2" micromatch@^4.0.0, micromatch@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" - integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== + version "4.0.4" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" + integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== dependencies: braces "^3.0.1" - picomatch "^2.0.5" + picomatch "^2.2.3" -mime-db@1.46.0: - version "1.46.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.46.0.tgz#6267748a7f799594de3cbc8cde91def349661cee" - integrity sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ== +mime-db@1.47.0: + version "1.47.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz#8cb313e59965d3c05cfbf898915a267af46a335c" + integrity sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw== mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.19: - version "2.1.29" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.29.tgz#1d4ab77da64b91f5f72489df29236563754bb1b2" - integrity sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ== + version "2.1.30" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz#6e7be8b4c479825f85ed6326695db73f9305d62d" + integrity sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg== dependencies: - mime-db "1.46.0" + mime-db "1.47.0" mimic-fn@^2.1.0: version "2.1.0" @@ -4100,9 +4088,9 @@ node-modules-regexp@^1.0.0: integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= node-notifier@^8.0.0: - version "8.0.1" - resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.1.tgz#f86e89bbc925f2b068784b31f382afdc6ca56be1" - integrity sha512-BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA== + version "8.0.2" + resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.2.tgz#f3167a38ef0d2c8a866a83e318c1ba0efeb702c5" + integrity sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg== dependencies: growly "^1.3.0" is-wsl "^2.2.0" @@ -4111,7 +4099,7 @@ node-notifier@^8.0.0: uuid "^8.3.0" which "^2.0.2" -node-releases@^1.1.70: +node-releases@^1.1.71: version "1.1.71" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb" integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg== @@ -4298,10 +4286,10 @@ parse-json@^5.0.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -parse5@5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" - integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug== +parse5@6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" + integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== pascalcase@^0.1.1: version "0.1.1" @@ -4343,10 +4331,10 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1: - version "2.2.2" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" - integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d" + integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg== pify@^5.0.0: version "5.0.0" @@ -4403,9 +4391,9 @@ progress@^2.0.0: integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== prompts@^2.0.1: - version "2.4.0" - resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.0.tgz#4aa5de0723a231d1ee9121c40fdf663df73f61d7" - integrity sha512-awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ== + version "2.4.1" + resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.1.tgz#befd3b1195ba052f9fd2fde8a486c4e82ee77f61" + integrity sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ== dependencies: kleur "^3.0.3" sisteransi "^1.0.5" @@ -4444,9 +4432,9 @@ querystringify@^2.1.1: integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== queue-microtask@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.2.tgz#abf64491e6ecf0f38a6502403d4cda04f372dfd3" - integrity sha512-dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg== + version "1.2.3" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== randombytes@^2.1.0: version "2.1.0" @@ -4456,9 +4444,9 @@ randombytes@^2.1.0: safe-buffer "^5.1.0" react-is@^17.0.1: - version "17.0.1" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339" - integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA== + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" + integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== read-pkg-up@^7.0.1: version "7.0.1" @@ -4554,9 +4542,9 @@ regjsgen@^0.5.1: integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A== regjsparser@^0.6.4: - version "0.6.7" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.7.tgz#c00164e1e6713c2e3ee641f1701c4b7aa0a7f86c" - integrity sha512-ib77G0uxsA2ovgiYbCVGx4Pv3PSttAx2vIwidqQzbL2U5S4Q+j00HdSAneSBuyVcMvEnTXMjiGgB+DlXozVhpQ== + version "0.6.9" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.9.tgz#b489eef7c9a2ce43727627011429cf833a7183e6" + integrity sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ== dependencies: jsesc "~0.5.0" @@ -4566,9 +4554,9 @@ remove-trailing-separator@^1.0.1: integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= repeat-element@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce" - integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g== + version "1.1.4" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9" + integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ== repeat-string@^1.6.1: version "1.6.1" @@ -4582,7 +4570,7 @@ request-promise-core@1.1.4: dependencies: lodash "^4.17.19" -request-promise-native@^1.0.8: +request-promise-native@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28" integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g== @@ -4733,7 +4721,7 @@ sane@^4.0.3: minimist "^1.1.1" walker "~1.0.5" -saxes@^5.0.0: +saxes@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw== @@ -4765,9 +4753,9 @@ semver@7.0.0: integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== semver@7.x, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4: - version "7.3.4" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" - integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== dependencies: lru-cache "^6.0.0" @@ -5003,17 +4991,17 @@ stealthy-require@^1.1.1: integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks= string-length@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1" - integrity sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw== + version "4.0.2" + resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a" + integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ== dependencies: char-regex "^1.0.2" strip-ansi "^6.0.0" string-width@^4.1.0, string-width@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" - integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== + version "4.2.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" + integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== dependencies: emoji-regex "^8.0.0" is-fullwidth-code-point "^3.0.0" @@ -5068,9 +5056,9 @@ supports-color@^7.0.0, supports-color@^7.1.0: has-flag "^4.0.0" supports-hyperlinks@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47" - integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA== + version "2.2.0" + resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb" + integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ== dependencies: has-flag "^4.0.0" supports-color "^7.0.0" @@ -5081,14 +5069,16 @@ symbol-tree@^3.2.4: integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== table@^6.0.4: - version "6.0.7" - resolved "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz#e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34" - integrity sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g== + version "6.7.0" + resolved "https://registry.yarnpkg.com/table/-/table-6.7.0.tgz#26274751f0ee099c547f6cb91d3eff0d61d155b2" + integrity sha512-SAM+5p6V99gYiiy2gT5ArdzgM1dLDed0nkrWmG6Fry/bUS/m9x83BwpJUOf1Qj/x2qJd+thL6IkIx7qPGRxqBw== dependencies: - ajv "^7.0.2" - lodash "^4.17.20" + ajv "^8.0.1" + lodash.clonedeep "^4.5.0" + lodash.truncate "^4.4.2" slice-ansi "^4.0.0" string-width "^4.2.0" + strip-ansi "^6.0.0" tapable@^1.0.0: version "1.1.3" @@ -5121,9 +5111,9 @@ terser-webpack-plugin@^5.1.1: terser "^5.5.1" terser@^5.5.1, terser@^5.6.0: - version "5.6.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.6.0.tgz#138cdf21c5e3100b1b3ddfddf720962f88badcd2" - integrity sha512-vyqLMoqadC1uR0vywqOZzriDYzgEkNJFK4q9GeyOBHIbiECHiWLKcWfbQWAUaPfxkjDhapSlZB9f7fkMrvkVjA== + version "5.7.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.0.tgz#a761eeec206bc87b605ab13029876ead938ae693" + integrity sha512-HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g== dependencies: commander "^2.20.0" source-map "~0.7.2" @@ -5198,7 +5188,7 @@ tough-cookie@^2.3.3, tough-cookie@~2.5.0: psl "^1.1.28" punycode "^2.1.1" -"tough-cookie@^2.3.3 || ^3.0.1 || ^4.0.0": +"tough-cookie@^2.3.3 || ^3.0.1 || ^4.0.0", tough-cookie@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4" integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg== @@ -5207,15 +5197,6 @@ tough-cookie@^2.3.3, tough-cookie@~2.5.0: punycode "^2.1.1" universalify "^0.1.2" -tough-cookie@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2" - integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg== - dependencies: - ip-regex "^2.1.0" - psl "^1.1.28" - punycode "^2.1.1" - tr46@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479" @@ -5224,9 +5205,9 @@ tr46@^2.0.2: punycode "^2.1.1" ts-jest@^26.5.3: - version "26.5.3" - resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.5.3.tgz#a6ee00ba547be3b09877550df40a1465d0295554" - integrity sha512-nBiiFGNvtujdLryU7MiMQh1iPmnZ/QvOskBbD2kURiI1MwqvxlxNnaAB/z9TbslMqCsSbu5BXvSSQPc5tvHGeA== + version "26.5.6" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.5.6.tgz#c32e0746425274e1dfe333f43cd3c800e014ec35" + integrity sha512-rua+rCP8DxpA8b4DQD/6X2HQS8Zy/xzViVYfEs2OQu68tkCuKLV0Md8pmX55+W24uRIyAsf/BajRfxOs+R2MKA== dependencies: bs-logger "0.x" buffer-from "1.x" @@ -5240,9 +5221,9 @@ ts-jest@^26.5.3: yargs-parser "20.x" ts-loader@^8.0.17: - version "8.0.17" - resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.17.tgz#98f2ccff9130074f4079fd89b946b4c637b1f2fc" - integrity sha512-OeVfSshx6ot/TCxRwpBHQ/4lRzfgyTkvi7ghDVrLXOHzTbSK413ROgu/xNqM72i3AFeAIJgQy78FwSMKmOW68w== + version "8.2.0" + resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.2.0.tgz#6a3aeaa378aecda543e2ed2c332d3123841d52e0" + integrity sha512-ebXBFrNyMSmbWgjnb3WBloUBK+VSx1xckaXsMXxlZRDqce/OPdYBVN5efB0W3V0defq0Gcy4YuzvPGqRgjj85A== dependencies: chalk "^4.1.0" enhanced-resolve "^4.0.0" @@ -5250,15 +5231,15 @@ ts-loader@^8.0.17: micromatch "^4.0.0" semver "^7.3.4" -tslib@^1.8.1, tslib@^1.9.0: +tslib@^1.8.1: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== tsutils@^3.17.1: - version "3.20.0" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.20.0.tgz#ea03ea45462e146b53d70ce0893de453ff24f698" - integrity sha512-RYbuQuvkhuqVeXweWT3tJLKOEJ/UUw9GjNEZGWdrLLlM+611o1gwLHBpxoFJKKl25fLprp2eVthtKs5JOrNeXg== + version "3.21.0" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" + integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA== dependencies: tslib "^1.8.1" @@ -5293,10 +5274,15 @@ type-detect@4.0.8: resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== -type-fest@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" - integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== +type-fest@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== + +type-fest@^0.21.3: + version "0.21.3" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" + integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== type-fest@^0.6.0: version "0.6.0" @@ -5316,9 +5302,9 @@ typedarray-to-buffer@^3.1.5: is-typedarray "^1.0.0" typescript@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.3.tgz#39062d8019912d43726298f09493d598048c1ce3" - integrity sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw== + version "4.2.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961" + integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg== unicode-canonical-property-names-ecmascript@^1.0.4: version "1.0.4" @@ -5407,14 +5393,14 @@ uuid@^8.3.0: integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== v8-compile-cache@^2.0.3, v8-compile-cache@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132" - integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q== + version "2.3.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" + integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== v8-to-istanbul@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.0.tgz#5b95cef45c0f83217ec79f8fc7ee1c8b486aee07" - integrity sha512-uXUVqNUCLa0AH1vuVxzi+MI4RfxEOKt9pBgKwHbgH7st8Kv2P1m+jvWNnektzBh5QShF3ODgKmUFCf38LnVz1g== + version "7.1.2" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz#30898d1a7fa0c84d225a2c1434fb958f290883c1" + integrity sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow== dependencies: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" @@ -5477,17 +5463,16 @@ webidl-conversions@^6.1.0: integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== webpack-cli@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.5.0.tgz#b5213b84adf6e1f5de6391334c9fa53a48850466" - integrity sha512-wXg/ef6Ibstl2f50mnkcHblRPN/P9J4Nlod5Hg9HGFgSeF8rsqDGHJeVe4aR26q9l62TUJi6vmvC2Qz96YJw1Q== + version "4.7.0" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.7.0.tgz#3195a777f1f802ecda732f6c95d24c0004bc5a35" + integrity sha512-7bKr9182/sGfjFm+xdZSwgQuFjgEcy0iCTIBxRUeteJ2Kr8/Wz0qNJX+jw60LU36jApt4nmMkep6+W5AKhok6g== dependencies: "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^1.0.1" - "@webpack-cli/info" "^1.2.2" - "@webpack-cli/serve" "^1.3.0" + "@webpack-cli/configtest" "^1.0.3" + "@webpack-cli/info" "^1.2.4" + "@webpack-cli/serve" "^1.4.0" colorette "^1.2.1" commander "^7.0.0" - enquirer "^2.3.6" execa "^5.0.0" fastest-levenshtein "^1.0.12" import-local "^3.0.2" @@ -5513,19 +5498,19 @@ webpack-sources@^2.1.1: source-map "^0.6.1" webpack@^5.24.4: - version "5.24.4" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.24.4.tgz#37d8cf95841dd23c809ea02931294b3455d74a59" - integrity sha512-RXOdxF9hFFFhg47BryCgyFrEyyu7Y/75/uiI2DoUiTMqysK+WczVSTppvkR47oZcmI/DPaXCiCiaXBP8QjkNpA== + version "5.37.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.37.0.tgz#2ab00f613faf494504eb2beef278dab7493cc39d" + integrity sha512-yvdhgcI6QkQkDe1hINBAJ1UNevqNGTVaCkD2SSJcB8rcrNNl922RI8i2DXUAuNfANoxwsiXXEA4ZPZI9q2oGLA== dependencies: "@types/eslint-scope" "^3.7.0" - "@types/estree" "^0.0.46" + "@types/estree" "^0.0.47" "@webassemblyjs/ast" "1.11.0" "@webassemblyjs/wasm-edit" "1.11.0" "@webassemblyjs/wasm-parser" "1.11.0" - acorn "^8.0.4" + acorn "^8.2.1" browserslist "^4.14.5" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.7.0" + enhanced-resolve "^5.8.0" es-module-lexer "^0.4.0" eslint-scope "^5.1.1" events "^3.2.0" @@ -5553,12 +5538,12 @@ whatwg-mimetype@^2.3.0: resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== -whatwg-url@^8.0.0: - version "8.4.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz#50fb9615b05469591d2b2bd6dfaed2942ed72837" - integrity sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw== +whatwg-url@^8.0.0, whatwg-url@^8.5.0: + version "8.5.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.5.0.tgz#7752b8464fc0903fec89aa9846fc9efe07351fd3" + integrity sha512-fy+R77xWv0AiqfLl4nuGUlQ3/6b5uNfQ4WAbGQVMYshCTCCPK9psC1nWh3XHuxGVCtlcDDQPQW1csmmIQo+fwg== dependencies: - lodash.sortby "^4.7.0" + lodash "^4.7.0" tr46 "^2.0.2" webidl-conversions "^6.1.0" @@ -5624,10 +5609,10 @@ write-file-atomic@^3.0.0: signal-exit "^3.0.2" typedarray-to-buffer "^3.1.5" -ws@^7.2.3, ws@^7.4.3: - version "7.4.3" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.3.tgz#1f9643de34a543b8edb124bdcbc457ae55a6e5cd" - integrity sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA== +ws@^7.4.3, ws@^7.4.4: + version "7.4.5" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1" + integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g== xml-name-validator@^3.0.0: version "3.0.0" @@ -5640,14 +5625,14 @@ xmlchars@^2.2.0: integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== y18n@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4" - integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ== + version "4.0.3" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" + integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ== y18n@^5.0.5: - version "5.0.5" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18" - integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg== + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== yallist@^4.0.0: version "4.0.0" @@ -5655,9 +5640,9 @@ yallist@^4.0.0: integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== yargs-parser@20.x, yargs-parser@^20.2.2: - version "20.2.6" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.6.tgz#69f920addf61aafc0b8b89002f5d66e28f2d8b20" - integrity sha512-AP1+fQIWSM/sMiET8fyayjx/J+JmTPt2Mr0FkrgqB4todtfa53sOsrSAcIrJRD5XS20bKUwaDIuMkWKCEiQLKA== + version "20.2.7" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a" + integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw== yargs-parser@^18.1.2: version "18.1.3" diff --git a/src/JSInterop/Microsoft.JSInterop.JS/src/yarn.lock b/src/JSInterop/Microsoft.JSInterop.JS/src/yarn.lock index 353fcba5bb3d..b438080d556a 100644 --- a/src/JSInterop/Microsoft.JSInterop.JS/src/yarn.lock +++ b/src/JSInterop/Microsoft.JSInterop.JS/src/yarn.lock @@ -3,19 +3,24 @@ "@babel/code-frame@^7.0.0": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e" - integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" + integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g== dependencies: - "@babel/highlight" "^7.8.3" + "@babel/highlight" "^7.12.13" -"@babel/highlight@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797" - integrity sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg== +"@babel/helper-validator-identifier@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288" + integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A== + +"@babel/highlight@^7.12.13": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz#3197e375711ef6bf834e67d0daec88e4f46113cf" + integrity sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg== dependencies: + "@babel/helper-validator-identifier" "^7.14.0" chalk "^2.0.0" - esutils "^2.0.2" js-tokens "^4.0.0" ansi-styles@^3.2.1: @@ -33,9 +38,9 @@ argparse@^1.0.7: sprintf-js "~1.0.2" balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== brace-expansion@^1.1.7: version "1.1.11" @@ -96,20 +101,20 @@ esprima@^4.0.0: resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esutils@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" - integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== - fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= +function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + glob@^7.1.1, glob@^7.1.3: - version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + version "7.1.7" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" + integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -123,6 +128,13 @@ has-flag@^3.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= +has@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== + dependencies: + function-bind "^1.1.1" + inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -136,15 +148,22 @@ inherits@2: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== +is-core-module@^2.2.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz#8e9fc8e15027b011418026e98f0e6f4d86305cc1" + integrity sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A== + dependencies: + has "^1.0.3" + js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== js-yaml@^3.13.1: - version "3.13.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" - integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw== + version "3.14.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== dependencies: argparse "^1.0.7" esprima "^4.0.0" @@ -186,10 +205,11 @@ path-parse@^1.0.6: integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== resolve@^1.3.2: - version "1.15.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8" - integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w== + version "1.20.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" + integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== dependencies: + is-core-module "^2.2.0" path-parse "^1.0.6" rimraf@^3.0.2: @@ -216,16 +236,11 @@ supports-color@^5.3.0: dependencies: has-flag "^3.0.0" -tslib@^1.13.0: +tslib@^1.13.0, tslib@^1.8.1: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^1.8.1: - version "1.11.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.0.tgz#f1f3528301621a53220d58373ae510ff747a66bc" - integrity sha512-BmndXUtiTn/VDDrJzQE7Mm22Ix3PxgLltW9bSNLoeCY31gnG2OPx0QqJnuc9oMIKioYrz487i6K9o4Pdn0j+Kg== - tslint@^6.1.3: version "6.1.3" resolved "https://registry.yarnpkg.com/tslint/-/tslint-6.1.3.tgz#5c23b2eccc32487d5523bd3a470e9aa31789d904" @@ -253,9 +268,9 @@ tsutils@^2.29.0: tslib "^1.8.1" typescript@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.2.tgz#1450f020618f872db0ea17317d16d8da8ddb8c4c" - integrity sha512-tbb+NVrLfnsJy3M59lsDgrzWIflR4d4TIUjz+heUnHZwdF7YsrMTKoRERiIvI2lvBG95dfpLxB21WZhys1bgaQ== + version "4.2.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961" + integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg== wrappy@1: version "1.0.2" diff --git a/src/SignalR/clients/ts/FunctionalTests/yarn.lock b/src/SignalR/clients/ts/FunctionalTests/yarn.lock index fb254dcd1b58..16013c3b548f 100644 --- a/src/SignalR/clients/ts/FunctionalTests/yarn.lock +++ b/src/SignalR/clients/ts/FunctionalTests/yarn.lock @@ -11,14 +11,14 @@ uid "" "@msgpack/msgpack@^2.4.0": - version "2.4.0" - resolved "https://registry.yarnpkg.com/@msgpack/msgpack/-/msgpack-2.4.0.tgz#789c69301388a6a44a47ce654014ecd1703c8fcc" - integrity sha512-5qzv53J43V8GaYsaETs29Q0Ehw9Dog6SG18MASZRQDuZYXtA5T7pymGE2S40NL0X8sjl8+TybmRa5O8d45V7MQ== + version "2.6.3" + resolved "https://registry.yarnpkg.com/@msgpack/msgpack/-/msgpack-2.6.3.tgz#e0e3cdac43500624ee5a0f2f2503351d5862e46c" + integrity sha512-dSJ1TBB9Hreienm5SFVbpKIcRRekQNULxvbmDVXQwRCZWYCIxZ23X+FlFWkg1LmGG+DIQZXH+2IW01QwxofT/g== "@types/bluebird@*": - version "3.5.33" - resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.33.tgz#d79c020f283bd50bd76101d7d300313c107325fc" - integrity sha512-ndEo1xvnYeHxm7I/5sF6tBvnsA4Tdi3zj1keRKRs12SP+2ye2A27NDJ1B6PqkfMbGAcT+mqQVqbZRIrhfOp5PQ== + version "3.5.34" + resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.34.tgz#0e9f1f4f5dfab98a421fb973b5f5690d22411893" + integrity sha512-QMc57Pf067Rr78l6f4FftvuIXPYxu0VYFRKrZk1Clv+LWy7gN2fTBiAiv68askFHEHZcTLPFd01kNlpKOiSPgQ== "@types/debug@0.0.30": version "0.0.30" @@ -34,17 +34,17 @@ "@types/estree" "*" "@types/eslint@*": - version "7.2.6" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.6.tgz#5e9aff555a975596c03a98b59ecd103decc70c3c" - integrity sha512-I+1sYH+NPQ3/tVqCeUSBwTE/0heyvtXqpIopUUArlBm0Kpocb8FbMa3AZ/ASKIFpN3rnEx932TTXDbt9OXsNDw== + version "7.2.10" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.10.tgz#4b7a9368d46c0f8cd5408c23288a59aa2394d917" + integrity sha512-kUEPnMKrqbtpCq/KTaGFFKAcz6Ethm2EjCoKIDaCmfRBWLbFuTcOJfTlorwbnboXBzahqWLgUp1BQeKHiJzPUQ== dependencies: "@types/estree" "*" "@types/json-schema" "*" -"@types/estree@*", "@types/estree@^0.0.46": - version "0.0.46" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.46.tgz#0fb6bfbbeabd7a30880504993369c4bf1deab1fe" - integrity sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg== +"@types/estree@*", "@types/estree@^0.0.47": + version "0.0.47" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.47.tgz#d7a51db20f0650efec24cd04994f523d93172ed4" + integrity sha512-c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg== "@types/jasmine@^2.8.8": version "2.8.17" @@ -65,9 +65,9 @@ "@types/node" "*" "@types/node@*": - version "14.14.31" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.31.tgz#72286bd33d137aa0d152d47ec7c1762563d34055" - integrity sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g== + version "15.0.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz#51e9c0920d1b45936ea04341aa3e2e58d339fb67" + integrity sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA== "@types/node@^9.6.28": version "9.6.61" @@ -220,10 +220,10 @@ accepts@~1.3.4: mime-types "~2.1.24" negotiator "0.6.2" -acorn@^8.0.4: - version "8.0.5" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.0.5.tgz#a3bfb872a74a6a7f661bc81b9849d9cac12601b7" - integrity sha512-v+DieK/HJkJOpFBETDJioequtc3PfxsWMaxIdIwujtF7FEV/MAyDQLlm6/zPvr7Mix07mLh6ccVwIsloceodlg== +acorn@^8.2.1: + version "8.2.4" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.4.tgz#caba24b08185c3b56e3168e97d15ed17f4d31fd0" + integrity sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg== adm-zip@~0.4.3: version "0.4.16" @@ -277,9 +277,9 @@ ansi-styles@^3.2.1: color-convert "^1.9.0" anymatch@~3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" - integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== + version "3.1.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== dependencies: normalize-path "^3.0.0" picomatch "^2.0.4" @@ -368,9 +368,9 @@ backo2@1.0.2: integrity sha1-MasayLEpNjRj41s+u2n038+6eUc= balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== base64-arraybuffer@0.1.5: version "0.1.5" @@ -457,15 +457,15 @@ braces@^3.0.2, braces@~3.0.2: fill-range "^7.0.1" browserslist@^4.14.5: - version "4.16.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz#340aa46940d7db878748567c5dea24a48ddf3717" - integrity sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw== + version "4.16.6" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2" + integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ== dependencies: - caniuse-lite "^1.0.30001181" - colorette "^1.2.1" - electron-to-chromium "^1.3.649" + caniuse-lite "^1.0.30001219" + colorette "^1.2.2" + electron-to-chromium "^1.3.723" escalade "^3.1.1" - node-releases "^1.1.70" + node-releases "^1.1.71" buffer-alloc-unsafe@^1.1.0: version "1.1.0" @@ -513,10 +513,10 @@ callsite@1.0.0: resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20" integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA= -caniuse-lite@^1.0.30001181: - version "1.0.30001191" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001191.tgz#bacb432b6701f690c8c5f7c680166b9a9f0843d9" - integrity sha512-xJJqzyd+7GCJXkcoBiQ1GuxEiOBCLQ0aVW9HMekifZsAVGdj5eJ4mFB9fEhSHipq9IOk/QXFJUiIr9lZT+EsGw== +caniuse-lite@^1.0.30001219: + version "1.0.30001228" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa" + integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A== caseless@~0.12.0: version "0.12.0" @@ -548,11 +548,9 @@ chokidar@^3.0.0: fsevents "~2.3.1" chrome-trace-event@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4" - integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ== - dependencies: - tslib "^1.9.0" + version "1.0.3" + resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" + integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== color-convert@^1.9.0: version "1.9.3" @@ -566,10 +564,10 @@ color-name@1.1.3: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= -colorette@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b" - integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw== +colorette@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" + integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== colors@^1.1.0: version "1.4.0" @@ -751,10 +749,10 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -electron-to-chromium@^1.3.649: - version "1.3.672" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.672.tgz#3a6e335016dab4bc584d5292adc4f98f54541f6a" - integrity sha512-gFQe7HBb0lbOMqK2GAS5/1F+B0IMdYiAgB9OT/w1F4M7lgJK2aNOMNOM622aEax+nS1cTMytkiT0uMOkbtFmHw== +electron-to-chromium@^1.3.723: + version "1.3.727" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz#857e310ca00f0b75da4e1db6ff0e073cc4a91ddf" + integrity sha512-Mfz4FIB4FSvEwBpDfdipRIrwd6uo8gUDoRDF4QEYb4h4tSuI3ov594OrjU6on042UlFHouIJpClDODGkPcBSbg== encodeurl@~1.0.2: version "1.0.2" @@ -808,10 +806,10 @@ engine.io@~3.2.0: engine.io-parser "~2.1.0" ws "~3.3.1" -enhanced-resolve@^5.7.0: - version "5.7.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz#525c5d856680fbd5052de453ac83e32049958b5c" - integrity sha512-6njwt/NsZFUKhM6j9U8hzVyD4E4r0x7NQzhTCbcWOJ0IQjNSAoalWmb0AE51Wn+fwan5qVESWi7t2ToBxs9vrw== +enhanced-resolve@^5.8.0: + version "5.8.2" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz#15ddc779345cbb73e97c611cd00c01c1e7bf4d8b" + integrity sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" @@ -822,9 +820,9 @@ ent@~2.2.0: integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0= es-module-lexer@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.4.0.tgz#21f4181cc8b7eee06855f1c59e6087c7bc4f77b0" - integrity sha512-iuEGihqqhKWFgh72Q/Jtch7V2t/ft8w8IPP2aEN8ArYKO+IWyo6hsi96hCdgyeEDQIV3InhYQ9BlwUFPGXrbEQ== + version "0.4.1" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.4.1.tgz#dda8c6a14d8f340a24e34331e0fab0cb50438e0e" + integrity sha512-ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA== es6-promise@^4.0.3, es6-promise@^4.2.4: version "4.2.8" @@ -889,14 +887,14 @@ eventemitter3@^4.0.0: integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== events@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379" - integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg== + version "3.3.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== eventsource@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0" - integrity sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ== + version "1.1.0" + resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.0.tgz#00e8ca7c92109e94b0ddf32dac677d841028cfaf" + integrity sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg== dependencies: original "^1.0.0" @@ -958,9 +956,9 @@ flatted@^2.0.0: integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA== follow-redirects@^1.0.0: - version "1.13.2" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.2.tgz#dd73c8effc12728ba5cf4259d760ea5fb83e3147" - integrity sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA== + version "1.14.1" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43" + integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg== forever-agent@~0.6.1: version "0.6.1" @@ -1015,9 +1013,9 @@ getpass@^0.1.1: assert-plus "^1.0.0" glob-parent@~5.1.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229" - integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ== + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== dependencies: is-glob "^4.0.1" @@ -1027,9 +1025,9 @@ glob-to-regexp@^0.4.1: integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: - version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + version "7.1.7" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" + integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -1166,9 +1164,9 @@ is-binary-path@~2.1.0: binary-extensions "^2.0.0" is-docker@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156" - integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw== + version "2.2.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== is-extglob@^2.1.1: version "2.1.1" @@ -1226,18 +1224,18 @@ isstream@~0.1.2: resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= -jasmine-core@^3.2.1, jasmine-core@^3.5.0, jasmine-core@~3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.6.0.tgz#491f3bb23941799c353ceb7a45b38a950ebc5a20" - integrity sha512-8uQYa7zJN8hq9z+g8z1bqCfdC8eoDAeVnM5sfqs7KHv9/ifoJ500m018fpFc7RDaO6SWCLCXwo/wPSNcdYTgcw== +jasmine-core@^3.2.1, jasmine-core@^3.5.0, jasmine-core@~3.7.0: + version "3.7.1" + resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.7.1.tgz#0401327f6249eac993d47bbfa18d4e8efacfb561" + integrity sha512-DH3oYDS/AUvvr22+xUBW62m1Xoy7tUlY1tsxKEJvl5JeJ7q8zd1K5bUwiOxdH+erj6l2vAMM3hV25Xs9/WrmuQ== jasmine@^3.2.0: - version "3.6.4" - resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.6.4.tgz#1f8e4a0d5028a2dc66942b73b9fef4c32be97ad5" - integrity sha512-hIeOou6y0BgCOKYgXYveQvlY+PTHgDPajFf+vLCYbMTQ+VjAP9+EQv0nuC9+gyCAAWISRFauB1XUb9kFuOKtcQ== + version "3.7.0" + resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.7.0.tgz#d36638c0c815e6ad5666676e386d79e2ccb70835" + integrity sha512-wlzGQ+cIFzMEsI+wDqmOwvnjTvolLFwlcpYLCqSPPH0prOQaW3P+IzMhHYn934l1imNvw07oCyX+vGUv3wmtSQ== dependencies: glob "^7.1.6" - jasmine-core "~3.6.0" + jasmine-core "~3.7.0" jest-worker@^26.6.2: version "26.6.2" @@ -1487,17 +1485,17 @@ merge-stream@^2.0.0: resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== -mime-db@1.46.0: - version "1.46.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.46.0.tgz#6267748a7f799594de3cbc8cde91def349661cee" - integrity sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ== +mime-db@1.47.0: + version "1.47.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz#8cb313e59965d3c05cfbf898915a267af46a335c" + integrity sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw== mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.19, mime-types@~2.1.24: - version "2.1.29" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.29.tgz#1d4ab77da64b91f5f72489df29236563754bb1b2" - integrity sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ== + version "2.1.30" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz#6e7be8b4c479825f85ed6326695db73f9305d62d" + integrity sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg== dependencies: - mime-db "1.46.0" + mime-db "1.47.0" mime@^2.3.1: version "2.5.2" @@ -1558,7 +1556,7 @@ node-fetch@^2.6.1: resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== -node-releases@^1.1.70: +node-releases@^1.1.71: version "1.1.71" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb" integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg== @@ -1654,9 +1652,9 @@ performance-now@^2.1.0: integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= picomatch@^2.0.4, picomatch@^2.2.1: - version "2.2.2" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" - integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== + version "2.2.3" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d" + integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg== process-nextick-args@~2.0.0: version "2.0.1" @@ -1796,9 +1794,9 @@ requires-port@^1.0.0: integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= rfdc@^1.1.4: - version "1.2.0" - resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.2.0.tgz#9e9894258f48f284b43c3143c68070a4f373b949" - integrity sha512-ijLyszTMmUrXvjSooucVQwimGUk84eRcmCuLV8Xghe3UO85mjUtRAHRyoMM6XtyqbECaXuBWx18La3523sXINA== + version "1.3.0" + resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b" + integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA== rimraf@^2.5.4, rimraf@^2.6.0: version "2.7.1" @@ -1808,9 +1806,9 @@ rimraf@^2.5.4, rimraf@^2.6.0: glob "^7.1.3" rxjs@^6.3.3: - version "6.6.3" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552" - integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ== + version "6.6.7" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" + integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== dependencies: tslib "^1.9.0" @@ -2032,9 +2030,9 @@ terser-webpack-plugin@^5.1.1: terser "^5.5.1" terser@^5.5.1: - version "5.6.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.6.0.tgz#138cdf21c5e3100b1b3ddfddf720962f88badcd2" - integrity sha512-vyqLMoqadC1uR0vywqOZzriDYzgEkNJFK4q9GeyOBHIbiECHiWLKcWfbQWAUaPfxkjDhapSlZB9f7fkMrvkVjA== + version "5.7.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.0.tgz#a761eeec206bc87b605ab13029876ead938ae693" + integrity sha512-HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g== dependencies: commander "^2.20.0" source-map "~0.7.2" @@ -2224,19 +2222,19 @@ webpack-sources@^2.1.1: source-map "^0.6.1" webpack@^5.23.0: - version "5.24.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.24.1.tgz#6b7730bfba1ee94b05d05ef7c32743a35105a744" - integrity sha512-eg+6OIt6npUSwbhRQY6XffAixEUSARBf+WAWOxrZwOB4jRbbpMXlridFy/Yt7N0U20Ry1vp/nnDbtN7l1rUdIA== + version "5.37.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.37.0.tgz#2ab00f613faf494504eb2beef278dab7493cc39d" + integrity sha512-yvdhgcI6QkQkDe1hINBAJ1UNevqNGTVaCkD2SSJcB8rcrNNl922RI8i2DXUAuNfANoxwsiXXEA4ZPZI9q2oGLA== dependencies: "@types/eslint-scope" "^3.7.0" - "@types/estree" "^0.0.46" + "@types/estree" "^0.0.47" "@webassemblyjs/ast" "1.11.0" "@webassemblyjs/wasm-edit" "1.11.0" "@webassemblyjs/wasm-parser" "1.11.0" - acorn "^8.0.4" + acorn "^8.2.1" browserslist "^4.14.5" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.7.0" + enhanced-resolve "^5.8.0" es-module-lexer "^0.4.0" eslint-scope "^5.1.1" events "^3.2.0" @@ -2277,9 +2275,9 @@ wrappy@1: async-limiter "~1.0.0" ws@^7.4.3: - version "7.4.3" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.3.tgz#1f9643de34a543b8edb124bdcbc457ae55a6e5cd" - integrity sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA== + version "7.4.5" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1" + integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g== ws@~3.3.1: version "3.3.3" diff --git a/src/SignalR/clients/ts/common/package.json b/src/SignalR/clients/ts/common/package.json index 7f5be2d7db63..bf8f6034ddef 100644 --- a/src/SignalR/clients/ts/common/package.json +++ b/src/SignalR/clients/ts/common/package.json @@ -18,12 +18,12 @@ "jest": "^26.6.3", "jest-junit": "^12.0.0", "rimraf": "^3.0.2", + "terser": "^5.6.0", + "terser-webpack-plugin": "^5.1.1", "ts-jest": "^26.5.2", "ts-loader": "^8.0.17", "tslint": "^6.1.3", "typescript": "^4.2.2", - "terser": "^5.6.0", - "terser-webpack-plugin": "^5.1.1", "webpack": "^5.24.1", "webpack-cli": "^4.5.0" } diff --git a/src/SignalR/clients/ts/common/yarn.lock b/src/SignalR/clients/ts/common/yarn.lock index fa5458fb9391..b4cdf326f905 100644 --- a/src/SignalR/clients/ts/common/yarn.lock +++ b/src/SignalR/clients/ts/common/yarn.lock @@ -9,51 +9,50 @@ dependencies: "@babel/highlight" "^7.12.13" -"@babel/compat-data@^7.13.0": - version "7.13.6" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.6.tgz#11972d07db4c2317afdbf41d6feb3a730301ef4e" - integrity sha512-VhgqKOWYVm7lQXlvbJnWOzwfAQATd2nV52koT0HZ/LdDH0m4DUDwkKYsH+IwpXb+bKPyBJzawA4I6nBKqZcpQw== +"@babel/compat-data@^7.13.15": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.0.tgz#a901128bce2ad02565df95e6ecbf195cf9465919" + integrity sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q== "@babel/core@^7.1.0", "@babel/core@^7.7.5": - version "7.13.1" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.1.tgz#7ddd027176debe40f13bb88bac0c21218c5b1ecf" - integrity sha512-FzeKfFBG2rmFtGiiMdXZPFt/5R5DXubVi82uYhjGX4Msf+pgYQMCFIqFXZWs5vbIYbf14VeBIgdGI03CDOOM1w== + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.0.tgz#47299ff3ec8d111b493f1a9d04bf88c04e728d88" + integrity sha512-8YqpRig5NmIHlMLw09zMlPTvUVMILjqCOtVgu+TVNWEBvy9b5I3RRyhqnrV4hjgEK7n8P9OqvkWJAFmEL6Wwfw== dependencies: "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.13.0" - "@babel/helper-compilation-targets" "^7.13.0" - "@babel/helper-module-transforms" "^7.13.0" - "@babel/helpers" "^7.13.0" - "@babel/parser" "^7.13.0" + "@babel/generator" "^7.14.0" + "@babel/helper-compilation-targets" "^7.13.16" + "@babel/helper-module-transforms" "^7.14.0" + "@babel/helpers" "^7.14.0" + "@babel/parser" "^7.14.0" "@babel/template" "^7.12.13" - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" + "@babel/traverse" "^7.14.0" + "@babel/types" "^7.14.0" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.1.2" - lodash "^4.17.19" - semver "7.0.0" + semver "^6.3.0" source-map "^0.5.0" -"@babel/generator@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.0.tgz#bd00d4394ca22f220390c56a0b5b85568ec1ec0c" - integrity sha512-zBZfgvBB/ywjx0Rgc2+BwoH/3H+lDtlgD4hBOpEv5LxRnYsm/753iRuLepqnYlynpjC3AdQxtxsoeHJoEEwOAw== +"@babel/generator@^7.14.0": + version "7.14.1" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.1.tgz#1f99331babd65700183628da186f36f63d615c93" + integrity sha512-TMGhsXMXCP/O1WtQmZjpEYDhCYC9vFhayWZPJSZCGkPJgUqX0rF0wwtrYvnzVxIjcF80tkUertXVk5cwqi5cAQ== dependencies: - "@babel/types" "^7.13.0" + "@babel/types" "^7.14.1" jsesc "^2.5.1" source-map "^0.5.0" -"@babel/helper-compilation-targets@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.0.tgz#c9cf29b82a76fd637f0faa35544c4ace60a155a1" - integrity sha512-SOWD0JK9+MMIhTQiUVd4ng8f3NXhPVQvTv7D3UN4wbp/6cAHnB2EmMaU1zZA2Hh1gwme+THBrVSqTFxHczTh0Q== +"@babel/helper-compilation-targets@^7.13.16": + version "7.13.16" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz#6e91dccf15e3f43e5556dffe32d860109887563c" + integrity sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA== dependencies: - "@babel/compat-data" "^7.13.0" + "@babel/compat-data" "^7.13.15" "@babel/helper-validator-option" "^7.12.17" browserslist "^4.14.5" - semver "7.0.0" + semver "^6.3.0" "@babel/helper-function-name@^7.12.13": version "7.12.13" @@ -71,34 +70,33 @@ dependencies: "@babel/types" "^7.12.13" -"@babel/helper-member-expression-to-functions@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz#6aa4bb678e0f8c22f58cdb79451d30494461b091" - integrity sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ== +"@babel/helper-member-expression-to-functions@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz#dfe368f26d426a07299d8d6513821768216e6d72" + integrity sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw== dependencies: - "@babel/types" "^7.13.0" + "@babel/types" "^7.13.12" -"@babel/helper-module-imports@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz#ec67e4404f41750463e455cc3203f6a32e93fcb0" - integrity sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g== +"@babel/helper-module-imports@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977" + integrity sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA== dependencies: - "@babel/types" "^7.12.13" + "@babel/types" "^7.13.12" -"@babel/helper-module-transforms@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz#42eb4bd8eea68bab46751212c357bfed8b40f6f1" - integrity sha512-Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw== +"@babel/helper-module-transforms@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.0.tgz#8fcf78be220156f22633ee204ea81f73f826a8ad" + integrity sha512-L40t9bxIuGOfpIGA3HNkJhU9qYrf4y5A5LUSw7rGMSn+pcG8dfJ0g6Zval6YJGd2nEjI7oP00fRdnhLKndx6bw== dependencies: - "@babel/helper-module-imports" "^7.12.13" - "@babel/helper-replace-supers" "^7.13.0" - "@babel/helper-simple-access" "^7.12.13" + "@babel/helper-module-imports" "^7.13.12" + "@babel/helper-replace-supers" "^7.13.12" + "@babel/helper-simple-access" "^7.13.12" "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/helper-validator-identifier" "^7.12.11" + "@babel/helper-validator-identifier" "^7.14.0" "@babel/template" "^7.12.13" - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" - lodash "^4.17.19" + "@babel/traverse" "^7.14.0" + "@babel/types" "^7.14.0" "@babel/helper-optimise-call-expression@^7.12.13": version "7.12.13" @@ -112,22 +110,22 @@ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af" integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ== -"@babel/helper-replace-supers@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz#6034b7b51943094cb41627848cb219cb02be1d24" - integrity sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw== +"@babel/helper-replace-supers@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz#6442f4c1ad912502481a564a7386de0c77ff3804" + integrity sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw== dependencies: - "@babel/helper-member-expression-to-functions" "^7.13.0" + "@babel/helper-member-expression-to-functions" "^7.13.12" "@babel/helper-optimise-call-expression" "^7.12.13" "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" + "@babel/types" "^7.13.12" -"@babel/helper-simple-access@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz#8478bcc5cacf6aa1672b251c1d2dde5ccd61a6c4" - integrity sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA== +"@babel/helper-simple-access@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz#dd6c538afb61819d205a012c31792a39c7a5eaf6" + integrity sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA== dependencies: - "@babel/types" "^7.12.13" + "@babel/types" "^7.13.12" "@babel/helper-split-export-declaration@^7.12.13": version "7.12.13" @@ -136,38 +134,38 @@ dependencies: "@babel/types" "^7.12.13" -"@babel/helper-validator-identifier@^7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed" - integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== +"@babel/helper-validator-identifier@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288" + integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A== "@babel/helper-validator-option@^7.12.17": version "7.12.17" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831" integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw== -"@babel/helpers@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.0.tgz#7647ae57377b4f0408bf4f8a7af01c42e41badc0" - integrity sha512-aan1MeFPxFacZeSz6Ld7YZo5aPuqnKlD7+HZY75xQsueczFccP9A7V05+oe0XpLwHK3oLorPe9eaAUljL7WEaQ== +"@babel/helpers@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.0.tgz#ea9b6be9478a13d6f961dbb5f36bf75e2f3b8f62" + integrity sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg== dependencies: "@babel/template" "^7.12.13" - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" + "@babel/traverse" "^7.14.0" + "@babel/types" "^7.14.0" "@babel/highlight@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.12.13.tgz#8ab538393e00370b26271b01fa08f7f27f2e795c" - integrity sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww== + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz#3197e375711ef6bf834e67d0daec88e4f46113cf" + integrity sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg== dependencies: - "@babel/helper-validator-identifier" "^7.12.11" + "@babel/helper-validator-identifier" "^7.14.0" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.13.0": - version "7.13.4" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.4.tgz#340211b0da94a351a6f10e63671fa727333d13ab" - integrity sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA== +"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.14.0": + version "7.14.1" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.1.tgz#1bd644b5db3f5797c4479d89ec1817fe02b84c47" + integrity sha512-muUGEKu8E/ftMTPlNp+mc6zL3E9zKWmF5sDHZ5MSsoTP9Wyz64AhEf9kD08xYJ7w6Hdcu8H550ircnPyWSIF0Q== "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -262,28 +260,26 @@ "@babel/parser" "^7.12.13" "@babel/types" "^7.12.13" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.0.tgz#6d95752475f86ee7ded06536de309a65fc8966cc" - integrity sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ== +"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.0.tgz#cea0dc8ae7e2b1dec65f512f39f3483e8cc95aef" + integrity sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA== dependencies: "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.13.0" + "@babel/generator" "^7.14.0" "@babel/helper-function-name" "^7.12.13" "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/parser" "^7.13.0" - "@babel/types" "^7.13.0" + "@babel/parser" "^7.14.0" + "@babel/types" "^7.14.0" debug "^4.1.0" globals "^11.1.0" - lodash "^4.17.19" -"@babel/types@^7.0.0", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.0.tgz#74424d2816f0171b4100f0ab34e9a374efdf7f80" - integrity sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA== +"@babel/types@^7.0.0", "@babel/types@^7.12.13", "@babel/types@^7.13.12", "@babel/types@^7.14.0", "@babel/types@^7.14.1", "@babel/types@^7.3.0", "@babel/types@^7.3.3": + version "7.14.1" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.1.tgz#095bd12f1c08ab63eff6e8f7745fa7c9cc15a9db" + integrity sha512-S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA== dependencies: - "@babel/helper-validator-identifier" "^7.12.11" - lodash "^4.17.19" + "@babel/helper-validator-identifier" "^7.14.0" to-fast-properties "^2.0.0" "@bcoe/v8-coverage@^0.2.3": @@ -492,9 +488,9 @@ chalk "^4.0.0" "@sinonjs/commons@^1.7.0": - version "1.8.2" - resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.2.tgz#858f5c4b48d80778fde4b9d541f27edc0d56488b" - integrity sha512-sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw== + version "1.8.3" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d" + integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ== dependencies: type-detect "4.0.8" @@ -511,9 +507,9 @@ integrity sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA== "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7": - version "7.1.12" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz#4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d" - integrity sha512-wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ== + version "7.1.14" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.14.tgz#faaeefc4185ec71c389f4501ee5ec84b170cc402" + integrity sha512-zGZJzzBUVDo/eV6KgbE0f0ZI7dInEYvo12Rb70uNQDshC3SkRMb67ja0GgRHZgAX3Za6rhaWlvbDO8rrGyAb1g== dependencies: "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" @@ -537,9 +533,9 @@ "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": - version "7.11.0" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.0.tgz#b9a1efa635201ba9bc850323a8793ee2d36c04a0" - integrity sha512-kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg== + version "7.11.1" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.1.tgz#654f6c4f67568e24c23b367e947098c6206fa639" + integrity sha512-Vs0hm0vPahPMYi9tDjtP66llufgO3ST16WXaSTtDGEl9cewAl3AibmxWw6TINOqHPT9z0uABKAYjT9jNSg4npw== dependencies: "@babel/types" "^7.3.0" @@ -552,17 +548,17 @@ "@types/estree" "*" "@types/eslint@*": - version "7.2.6" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.6.tgz#5e9aff555a975596c03a98b59ecd103decc70c3c" - integrity sha512-I+1sYH+NPQ3/tVqCeUSBwTE/0heyvtXqpIopUUArlBm0Kpocb8FbMa3AZ/ASKIFpN3rnEx932TTXDbt9OXsNDw== + version "7.2.10" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.10.tgz#4b7a9368d46c0f8cd5408c23288a59aa2394d917" + integrity sha512-kUEPnMKrqbtpCq/KTaGFFKAcz6Ethm2EjCoKIDaCmfRBWLbFuTcOJfTlorwbnboXBzahqWLgUp1BQeKHiJzPUQ== dependencies: "@types/estree" "*" "@types/json-schema" "*" -"@types/estree@*", "@types/estree@^0.0.46": - version "0.0.46" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.46.tgz#0fb6bfbbeabd7a30880504993369c4bf1deab1fe" - integrity sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg== +"@types/estree@*", "@types/estree@^0.0.47": + version "0.0.47" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.47.tgz#d7a51db20f0650efec24cd04994f523d93172ed4" + integrity sha512-c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg== "@types/graceful-fs@^4.1.2": version "4.1.5" @@ -590,10 +586,10 @@ dependencies: "@types/istanbul-lib-report" "*" -"@types/jest@26.x", "@types/jest@^26.0.20": - version "26.0.20" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.20.tgz#cd2f2702ecf69e86b586e1f5223a60e454056307" - integrity sha512-9zi2Y+5USJRxd0FsahERhBwlcvFh6D2GLQnY2FH2BzK8J9s9omvNHIbvABwIluXa0fD8XVKMLTO0aOEuUfACAA== +"@types/jest@^26.0.20": + version "26.0.23" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.23.tgz#a1b7eab3c503b80451d019efb588ec63522ee4e7" + integrity sha512-ZHLmWMJ9jJ9PTiT58juykZpL7KjwJywFN3Rr2pTSkyQfydf/rk22yS7W8p5DaVUMQ2BQC7oYiU3FjbTM/mYrOA== dependencies: jest-diff "^26.0.0" pretty-format "^26.0.0" @@ -603,10 +599,15 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad" integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA== -"@types/node@*", "@types/node@^14.14.31": - version "14.14.31" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.31.tgz#72286bd33d137aa0d152d47ec7c1762563d34055" - integrity sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g== +"@types/node@*": + version "15.0.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz#51e9c0920d1b45936ea04341aa3e2e58d339fb67" + integrity sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA== + +"@types/node@^14.14.31": + version "14.14.44" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.44.tgz#df7503e6002847b834371c004b372529f3f85215" + integrity sha512-+gaugz6Oce6ZInfI/tK4Pq5wIIkJMEJUu92RB3Eu93mtj4wjjjz9EB5mLp5s1pSsLXdC/CPut/xF20ZzAQJbTA== "@types/normalize-package-data@^2.4.0": version "2.4.0" @@ -614,9 +615,9 @@ integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA== "@types/prettier@^2.0.0": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.1.tgz#374e31645d58cb18a07b3ecd8e9dede4deb2cccd" - integrity sha512-DxZZbyMAM9GWEzXL+BMZROWz9oo6A9EilwwOMET2UVu2uZTqMWS5S69KVtuVKaRjCUpcrOXRalet86/OpG4kqw== + version "2.2.3" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.3.tgz#ef65165aea2924c9359205bf748865b8881753c0" + integrity sha512-PijRCG/K3s3w1We6ynUKdxEc5AcuuH3NBmMDP8uvKVp6X43UY7NQlTzczakXP3DJR0F4dfNQIGjU2cUeRYs2AA== "@types/source-list-map@*": version "0.1.2" @@ -628,15 +629,15 @@ resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff" integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw== -"@types/tapable@*": - version "1.0.6" - resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.6.tgz#a9ca4b70a18b270ccb2bc0aaafefd1d486b7ea74" - integrity sha512-W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA== +"@types/tapable@^1": + version "1.0.7" + resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.7.tgz#545158342f949e8fd3bfd813224971ecddc3fac4" + integrity sha512-0VBprVqfgFD7Ehb2vd8Lh9TG3jP98gvr8rgehQqzztZNI7o8zS8Ad4jyZneKELphpuE212D8J70LnSNQSyO6bQ== "@types/uglify-js@*": - version "3.12.0" - resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.12.0.tgz#2bb061c269441620d46b946350c8f16d52ef37c5" - integrity sha512-sYAF+CF9XZ5cvEBkI7RtrG9g2GtMBkviTnBxYYyq+8BWvO4QtXfwwR6a2LFwCi4evMKZfpv6U43ViYvv17Wz3Q== + version "3.13.0" + resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.13.0.tgz#1cad8df1fb0b143c5aba08de5712ea9d1ff71124" + integrity sha512-EGkrJD5Uy+Pg0NUR8uA4bJ5WMfljyad0G+784vLCNUkD+QwOJXUbBYExXfVGf7YtyzdQp3L/XMYcliB987kL5Q== dependencies: source-map "^0.6.1" @@ -650,13 +651,13 @@ source-map "^0.7.3" "@types/webpack@^4.41.26": - version "4.41.26" - resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.26.tgz#27a30d7d531e16489f9c7607c747be6bc1a459ef" - integrity sha512-7ZyTfxjCRwexh+EJFwRUM+CDB2XvgHl4vfuqf1ZKrgGvcS5BrNvPQqJh3tsZ0P6h6Aa1qClVHaJZszLPzpqHeA== + version "4.41.28" + resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.28.tgz#0069a2159b7ad4d83d0b5801942c17d54133897b" + integrity sha512-Nn84RAiJjKRfPFFCVR8LC4ueTtTdfWAMZ03THIzZWRJB+rX24BD3LqPSFnbMscWauEsT4segAsylPDIaZyZyLQ== dependencies: "@types/anymatch" "*" "@types/node" "*" - "@types/tapable" "*" + "@types/tapable" "^1" "@types/uglify-js" "*" "@types/webpack-sources" "*" source-map "^0.6.0" @@ -794,22 +795,22 @@ "@webassemblyjs/ast" "1.11.0" "@xtuc/long" "4.2.2" -"@webpack-cli/configtest@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.1.tgz#241aecfbdc715eee96bed447ed402e12ec171935" - integrity sha512-B+4uBUYhpzDXmwuo3V9yBH6cISwxEI4J+NO5ggDaGEEHb0osY/R7MzeKc0bHURXQuZjMM4qD+bSJCKIuI3eNBQ== +"@webpack-cli/configtest@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.3.tgz#204bcff87cda3ea4810881f7ea96e5f5321b87b9" + integrity sha512-WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw== -"@webpack-cli/info@^1.2.2": - version "1.2.2" - resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.2.tgz#ef3c0cd947a1fa083e174a59cb74e0b6195c236c" - integrity sha512-5U9kUJHnwU+FhKH4PWGZuBC1hTEPYyxGSL5jjoBI96Gx8qcYJGOikpiIpFoTq8mmgX3im2zAo2wanv/alD74KQ== +"@webpack-cli/info@^1.2.4": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.4.tgz#7381fd41c9577b2d8f6c2594fad397ef49ad5573" + integrity sha512-ogE2T4+pLhTTPS/8MM3IjHn0IYplKM4HbVNMCWA9N4NrdPzunwenpCsqKEXyejMfRu6K8mhauIPYf8ZxWG5O6g== dependencies: envinfo "^7.7.3" -"@webpack-cli/serve@^1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.3.0.tgz#2730c770f5f1f132767c63dcaaa4ec28f8c56a6c" - integrity sha512-k2p2VrONcYVX1wRRrf0f3X2VGltLWcv+JzXRBDmvCxGlCeESx4OXw91TsWeKOkp784uNoVQo313vxJFHXPPwfw== +"@webpack-cli/serve@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.4.0.tgz#f84fd07bcacefe56ce762925798871092f0f228e" + integrity sha512-xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg== "@xtuc/ieee754@^1.2.0": version "1.2.0" @@ -821,7 +822,7 @@ resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== -abab@^2.0.3: +abab@^2.0.3, abab@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q== @@ -844,10 +845,10 @@ acorn@^7.1.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.0.4: - version "8.0.5" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.0.5.tgz#a3bfb872a74a6a7f661bc81b9849d9cac12601b7" - integrity sha512-v+DieK/HJkJOpFBETDJioequtc3PfxsWMaxIdIwujtF7FEV/MAyDQLlm6/zPvr7Mix07mLh6ccVwIsloceodlg== +acorn@^8.1.0, acorn@^8.2.1: + version "8.2.4" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.4.tgz#caba24b08185c3b56e3168e97d15ed17f4d31fd0" + integrity sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg== ajv-keywords@^3.5.2: version "3.5.2" @@ -864,17 +865,12 @@ ajv@^6.12.3, ajv@^6.12.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ansi-colors@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" - integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== - ansi-escapes@^4.2.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61" - integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA== + version "4.3.2" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" + integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== dependencies: - type-fest "^0.11.0" + type-fest "^0.21.3" ansi-regex@^4.1.0: version "4.1.0" @@ -909,9 +905,9 @@ anymatch@^2.0.0: normalize-path "^2.1.1" anymatch@^3.0.3: - version "3.1.1" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" - integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== + version "3.1.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== dependencies: normalize-path "^3.0.0" picomatch "^2.0.4" @@ -1042,9 +1038,9 @@ babel-preset-jest@^26.6.2: babel-preset-current-node-syntax "^1.0.0" balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== base@^0.11.1: version "0.11.2" @@ -1108,15 +1104,15 @@ browser-process-hrtime@^1.0.0: integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== browserslist@^4.14.5: - version "4.16.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz#340aa46940d7db878748567c5dea24a48ddf3717" - integrity sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw== + version "4.16.6" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2" + integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ== dependencies: - caniuse-lite "^1.0.30001181" - colorette "^1.2.1" - electron-to-chromium "^1.3.649" + caniuse-lite "^1.0.30001219" + colorette "^1.2.2" + electron-to-chromium "^1.3.723" escalade "^3.1.1" - node-releases "^1.1.70" + node-releases "^1.1.71" bs-logger@0.x: version "0.2.6" @@ -1172,10 +1168,10 @@ camelcase@^6.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== -caniuse-lite@^1.0.30001181: - version "1.0.30001191" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001191.tgz#bacb432b6701f690c8c5f7c680166b9a9f0843d9" - integrity sha512-xJJqzyd+7GCJXkcoBiQ1GuxEiOBCLQ0aVW9HMekifZsAVGdj5eJ4mFB9fEhSHipq9IOk/QXFJUiIr9lZT+EsGw== +caniuse-lite@^1.0.30001219: + version "1.0.30001228" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa" + integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A== capture-exit@^2.0.0: version "2.0.0" @@ -1199,9 +1195,9 @@ chalk@^2.0.0, chalk@^2.3.0: supports-color "^5.3.0" chalk@^4.0.0, chalk@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" - integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== + version "4.1.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" + integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" @@ -1212,11 +1208,9 @@ char-regex@^1.0.2: integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== chrome-trace-event@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4" - integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ== - dependencies: - tslib "^1.9.0" + version "1.0.3" + resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" + integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== ci-info@^2.0.0: version "2.0.0" @@ -1307,10 +1301,10 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -colorette@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b" - integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw== +colorette@^1.2.1, colorette@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" + integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== combined-stream@^1.0.6, combined-stream@~1.0.6: version "1.0.8" @@ -1325,9 +1319,9 @@ commander@^2.12.1, commander@^2.20.0: integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== commander@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-7.1.0.tgz#f2eaecf131f10e36e07d894698226e36ae0eb5ff" - integrity sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg== + version "7.2.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" + integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== component-emitter@^1.2.1: version "1.3.0" @@ -1386,7 +1380,7 @@ cssom@~0.3.6: resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== -cssstyle@^2.2.0: +cssstyle@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852" integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A== @@ -1428,7 +1422,7 @@ decamelize@^1.2.0: resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= -decimal.js@^10.2.0: +decimal.js@^10.2.1: version "10.2.1" resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz#238ae7b0f0c793d3e3cea410108b35a2c01426a3" integrity sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw== @@ -1505,10 +1499,10 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" safer-buffer "^2.1.0" -electron-to-chromium@^1.3.649: - version "1.3.672" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.672.tgz#3a6e335016dab4bc584d5292adc4f98f54541f6a" - integrity sha512-gFQe7HBb0lbOMqK2GAS5/1F+B0IMdYiAgB9OT/w1F4M7lgJK2aNOMNOM622aEax+nS1cTMytkiT0uMOkbtFmHw== +electron-to-chromium@^1.3.723: + version "1.3.727" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz#857e310ca00f0b75da4e1db6ff0e073cc4a91ddf" + integrity sha512-Mfz4FIB4FSvEwBpDfdipRIrwd6uo8gUDoRDF4QEYb4h4tSuI3ov594OrjU6on042UlFHouIJpClDODGkPcBSbg== emittery@^0.7.1: version "0.7.2" @@ -1541,25 +1535,18 @@ enhanced-resolve@^4.0.0: memory-fs "^0.5.0" tapable "^1.0.0" -enhanced-resolve@^5.7.0: - version "5.7.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz#525c5d856680fbd5052de453ac83e32049958b5c" - integrity sha512-6njwt/NsZFUKhM6j9U8hzVyD4E4r0x7NQzhTCbcWOJ0IQjNSAoalWmb0AE51Wn+fwan5qVESWi7t2ToBxs9vrw== +enhanced-resolve@^5.8.0: + version "5.8.2" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz#15ddc779345cbb73e97c611cd00c01c1e7bf4d8b" + integrity sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" -enquirer@^2.3.6: - version "2.3.6" - resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" - integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== - dependencies: - ansi-colors "^4.1.1" - envinfo@^7.7.3: - version "7.7.4" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.7.4.tgz#c6311cdd38a0e86808c1c9343f667e4267c4a320" - integrity sha512-TQXTYFVVwwluWSFis6K2XKxgrD22jEv0FTuLCQI+OjH7rn93+iY0fSSFM5lrSxFY+H1+B0/cvvlamr3UsBivdQ== + version "7.8.1" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" + integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== errno@^0.1.3: version "0.1.8" @@ -1576,9 +1563,9 @@ error-ex@^1.3.1: is-arrayish "^0.2.1" es-module-lexer@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.4.0.tgz#21f4181cc8b7eee06855f1c59e6087c7bc4f77b0" - integrity sha512-iuEGihqqhKWFgh72Q/Jtch7V2t/ft8w8IPP2aEN8ArYKO+IWyo6hsi96hCdgyeEDQIV3InhYQ9BlwUFPGXrbEQ== + version "0.4.1" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.4.1.tgz#dda8c6a14d8f340a24e34331e0fab0cb50438e0e" + integrity sha512-ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA== escalade@^3.1.1: version "3.1.1" @@ -1595,13 +1582,13 @@ escape-string-regexp@^2.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== -escodegen@^1.14.1: - version "1.14.3" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503" - integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw== +escodegen@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" + integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw== dependencies: esprima "^4.0.1" - estraverse "^4.2.0" + estraverse "^5.2.0" esutils "^2.0.2" optionator "^0.8.1" optionalDependencies: @@ -1627,7 +1614,7 @@ esrecurse@^4.3.0: dependencies: estraverse "^5.2.0" -estraverse@^4.1.1, estraverse@^4.2.0: +estraverse@^4.1.1: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== @@ -1643,14 +1630,14 @@ esutils@^2.0.2: integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== events@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379" - integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg== + version "3.3.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== exec-sh@^0.3.2: - version "0.3.4" - resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5" - integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A== + version "0.3.6" + resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc" + integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w== execa@^1.0.0: version "1.0.0" @@ -1841,9 +1828,9 @@ form-data@~2.3.2: mime-types "^2.1.12" fp-ts@^2.6.1: - version "2.9.5" - resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-2.9.5.tgz#6690cd8b76b84214a38fc77cbbbd04a38f86ea90" - integrity sha512-MiHrA5teO6t8zKArE3DdMPT/Db6v2GUt5yfWnhBTrrsVfeCJUUnV6sgFvjGNBKDmEMqVwRFkEePL7wPwqrLKKA== + version "2.10.5" + resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-2.10.5.tgz#7c77868fe8bd9b229743303c1bec505b959f631b" + integrity sha512-X2KfTIV0cxIk3d7/2Pvp/pxL/xr2MV1WooyEzKtTWYSc1+52VF4YzjBTXqeOlSiZsPCxIBpDGfT9Dyo7WEY0DQ== fragment-cache@^0.2.1: version "0.2.1" @@ -1897,9 +1884,9 @@ get-stream@^5.0.0: pump "^3.0.0" get-stream@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.0.tgz#3e0012cb6827319da2706e601a1583e8629a6718" - integrity sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg== + version "6.0.1" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" + integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" @@ -1919,9 +1906,9 @@ glob-to-regexp@^0.4.1: integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: - version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + version "7.1.7" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" + integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -2076,9 +2063,9 @@ inherits@2, inherits@~2.0.3: integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== inspectpack@^4.6.1: - version "4.6.1" - resolved "https://registry.yarnpkg.com/inspectpack/-/inspectpack-4.6.1.tgz#96ce22220fda63ce166d4e2b2d94b4bf6065abc9" - integrity sha512-0TyiQzY2MTr7sFKAZUWm8TPx40/bjvlaqbqJHW+FHUbzUJ4p6EBJEndoZW01IacJd37eMBQJy/uw3k0LqRMOhg== + version "4.7.1" + resolved "https://registry.yarnpkg.com/inspectpack/-/inspectpack-4.7.1.tgz#baf081bae0b5b31bbedd534424e658f32d60f97a" + integrity sha512-XoDJbKSM9I2KA+8+OLFJHm8m4NM2pMEgsDD2hze6swVfynEed9ngCx36mRR+otzOsskwnxIZWXjI23FTW1uHqA== dependencies: chalk "^4.1.0" fp-ts "^2.6.1" @@ -2099,14 +2086,9 @@ io-ts-reporters@^1.2.2: integrity sha512-igASwWWkDY757OutNcM6zTtdJf/eTZYkoe2ymsX2qpm5bKZLo74FJYjsCtMQOEdY7dRHLLEulCyFQwdN69GBCg== io-ts@^2.2.13: - version "2.2.15" - resolved "https://registry.yarnpkg.com/io-ts/-/io-ts-2.2.15.tgz#0b0b19a6f8a64f4a524ad5810d56432789428128" - integrity sha512-ww2ZPrErx5pjCCI/tWRwjlEIDEndnN9kBIxAylXj+WNIH4ZVgaUqFuabGouehkRuvrmvzO5OnZmLf+o50h4izQ== - -ip-regex@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" - integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk= + version "2.2.16" + resolved "https://registry.yarnpkg.com/io-ts/-/io-ts-2.2.16.tgz#597dffa03db1913fc318c9c6df6931cb4ed808b2" + integrity sha512-y5TTSa6VP6le0hhmIyN0dqEXkrZeJLeC5KApJq6VLci3UEKF80lZ+KuoUs02RhBxNWlrqSNxzfI7otLX1Euv8Q== is-accessor-descriptor@^0.1.6: version "0.1.6" @@ -2140,9 +2122,9 @@ is-ci@^2.0.0: ci-info "^2.0.0" is-core-module@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a" - integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ== + version "2.4.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz#8e9fc8e15027b011418026e98f0e6f4d86305cc1" + integrity sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A== dependencies: has "^1.0.3" @@ -2179,9 +2161,9 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2: kind-of "^6.0.2" is-docker@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156" - integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw== + version "2.2.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" @@ -2225,9 +2207,9 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4: isobject "^3.0.1" is-potential-custom-element-name@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397" - integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c= + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" + integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== is-stream@^1.1.0: version "1.1.0" @@ -2726,35 +2708,35 @@ jsbn@~0.1.0: integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= jsdom@^16.4.0: - version "16.4.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz#36005bde2d136f73eee1a830c6d45e55408edddb" - integrity sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w== + version "16.5.3" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.3.tgz#13a755b3950eb938b4482c407238ddf16f0d2136" + integrity sha512-Qj1H+PEvUsOtdPJ056ewXM4UJPCi4hhLA8wpiz9F2YvsRBhuFsXxtrIFAgGBDynQA9isAMGE91PfUYbdMPXuTA== dependencies: - abab "^2.0.3" - acorn "^7.1.1" + abab "^2.0.5" + acorn "^8.1.0" acorn-globals "^6.0.0" cssom "^0.4.4" - cssstyle "^2.2.0" + cssstyle "^2.3.0" data-urls "^2.0.0" - decimal.js "^10.2.0" + decimal.js "^10.2.1" domexception "^2.0.1" - escodegen "^1.14.1" + escodegen "^2.0.0" html-encoding-sniffer "^2.0.1" is-potential-custom-element-name "^1.0.0" nwsapi "^2.2.0" - parse5 "5.1.1" + parse5 "6.0.1" request "^2.88.2" - request-promise-native "^1.0.8" - saxes "^5.0.0" + request-promise-native "^1.0.9" + saxes "^5.0.1" symbol-tree "^3.2.4" - tough-cookie "^3.0.1" + tough-cookie "^4.0.0" w3c-hr-time "^1.0.2" w3c-xmlserializer "^2.0.0" webidl-conversions "^6.1.0" whatwg-encoding "^1.0.5" whatwg-mimetype "^2.3.0" - whatwg-url "^8.0.0" - ws "^7.2.3" + whatwg-url "^8.5.0" + ws "^7.4.4" xml-name-validator "^3.0.0" jsesc@^2.5.1: @@ -2872,12 +2854,7 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" -lodash.sortby@^4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" - integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= - -lodash@4.x, lodash@^4.17.19: +lodash@4.x, lodash@^4.17.19, lodash@^4.7.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -2953,24 +2930,24 @@ micromatch@^3.1.4: to-regex "^3.0.2" micromatch@^4.0.0, micromatch@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" - integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== + version "4.0.4" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" + integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== dependencies: braces "^3.0.1" - picomatch "^2.0.5" + picomatch "^2.2.3" -mime-db@1.46.0: - version "1.46.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.46.0.tgz#6267748a7f799594de3cbc8cde91def349661cee" - integrity sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ== +mime-db@1.47.0: + version "1.47.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz#8cb313e59965d3c05cfbf898915a267af46a335c" + integrity sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw== mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.19: - version "2.1.29" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.29.tgz#1d4ab77da64b91f5f72489df29236563754bb1b2" - integrity sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ== + version "2.1.30" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz#6e7be8b4c479825f85ed6326695db73f9305d62d" + integrity sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg== dependencies: - mime-db "1.46.0" + mime-db "1.47.0" mimic-fn@^2.1.0: version "2.1.0" @@ -3062,9 +3039,9 @@ node-modules-regexp@^1.0.0: integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= node-notifier@^8.0.0: - version "8.0.1" - resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.1.tgz#f86e89bbc925f2b068784b31f382afdc6ca56be1" - integrity sha512-BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA== + version "8.0.2" + resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.2.tgz#f3167a38ef0d2c8a866a83e318c1ba0efeb702c5" + integrity sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg== dependencies: growly "^1.3.0" is-wsl "^2.2.0" @@ -3073,7 +3050,7 @@ node-notifier@^8.0.0: uuid "^8.3.0" which "^2.0.2" -node-releases@^1.1.70: +node-releases@^1.1.71: version "1.1.71" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb" integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg== @@ -3219,10 +3196,10 @@ parse-json@^5.0.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -parse5@5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" - integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug== +parse5@6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" + integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== pascalcase@^0.1.1: version "0.1.1" @@ -3259,10 +3236,10 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -picomatch@^2.0.4, picomatch@^2.0.5: - version "2.2.2" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" - integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== +picomatch@^2.0.4, picomatch@^2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d" + integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg== pify@^5.0.0: version "5.0.0" @@ -3309,9 +3286,9 @@ process-nextick-args@~2.0.0: integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== prompts@^2.0.1: - version "2.4.0" - resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.0.tgz#4aa5de0723a231d1ee9121c40fdf663df73f61d7" - integrity sha512-awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ== + version "2.4.1" + resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.1.tgz#befd3b1195ba052f9fd2fde8a486c4e82ee77f61" + integrity sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ== dependencies: kleur "^3.0.3" sisteransi "^1.0.5" @@ -3321,7 +3298,7 @@ prr@~1.0.1: resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY= -psl@^1.1.28: +psl@^1.1.28, psl@^1.1.33: version "1.8.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== @@ -3352,9 +3329,9 @@ randombytes@^2.1.0: safe-buffer "^5.1.0" react-is@^17.0.1: - version "17.0.1" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339" - integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA== + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" + integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== read-pkg-up@^7.0.1: version "7.0.1" @@ -3409,9 +3386,9 @@ remove-trailing-separator@^1.0.1: integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= repeat-element@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce" - integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g== + version "1.1.4" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9" + integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ== repeat-string@^1.6.1: version "1.6.1" @@ -3425,7 +3402,7 @@ request-promise-core@1.1.4: dependencies: lodash "^4.17.19" -request-promise-native@^1.0.8: +request-promise-native@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28" integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g== @@ -3549,7 +3526,7 @@ sane@^4.0.3: minimist "^1.1.1" walker "~1.0.5" -saxes@^5.0.0: +saxes@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw== @@ -3575,15 +3552,10 @@ semver-compare@^1.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" - integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== - semver@7.x, semver@^7.3.2, semver@^7.3.4: - version "7.3.4" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" - integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== dependencies: lru-cache "^6.0.0" @@ -3813,17 +3785,17 @@ stealthy-require@^1.1.1: integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks= string-length@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1" - integrity sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw== + version "4.0.2" + resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a" + integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ== dependencies: char-regex "^1.0.2" strip-ansi "^6.0.0" string-width@^4.1.0, string-width@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" - integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== + version "4.2.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" + integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== dependencies: emoji-regex "^8.0.0" is-fullwidth-code-point "^3.0.0" @@ -3880,9 +3852,9 @@ supports-color@^7.0.0, supports-color@^7.1.0: has-flag "^4.0.0" supports-hyperlinks@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47" - integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA== + version "2.2.0" + resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb" + integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ== dependencies: has-flag "^4.0.0" supports-color "^7.0.0" @@ -3923,9 +3895,9 @@ terser-webpack-plugin@^5.1.1: terser "^5.5.1" terser@^5.5.1, terser@^5.6.0: - version "5.6.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.6.0.tgz#138cdf21c5e3100b1b3ddfddf720962f88badcd2" - integrity sha512-vyqLMoqadC1uR0vywqOZzriDYzgEkNJFK4q9GeyOBHIbiECHiWLKcWfbQWAUaPfxkjDhapSlZB9f7fkMrvkVjA== + version "5.7.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.0.tgz#a761eeec206bc87b605ab13029876ead938ae693" + integrity sha512-HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g== dependencies: commander "^2.20.0" source-map "~0.7.2" @@ -3995,14 +3967,14 @@ tough-cookie@^2.3.3, tough-cookie@~2.5.0: psl "^1.1.28" punycode "^2.1.1" -tough-cookie@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2" - integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg== +tough-cookie@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4" + integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg== dependencies: - ip-regex "^2.1.0" - psl "^1.1.28" + psl "^1.1.33" punycode "^2.1.1" + universalify "^0.1.2" tr46@^2.0.2: version "2.0.2" @@ -4012,11 +3984,10 @@ tr46@^2.0.2: punycode "^2.1.1" ts-jest@^26.5.2: - version "26.5.2" - resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.5.2.tgz#5281d6b44c2f94f71205728a389edc3d7995b0c4" - integrity sha512-bwyJ2zJieSugf7RB+o8fgkMeoMVMM2KPDE0UklRLuACxjwJsOrZNo6chrcScmK33YavPSwhARffy8dZx5LJdUQ== + version "26.5.6" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.5.6.tgz#c32e0746425274e1dfe333f43cd3c800e014ec35" + integrity sha512-rua+rCP8DxpA8b4DQD/6X2HQS8Zy/xzViVYfEs2OQu68tkCuKLV0Md8pmX55+W24uRIyAsf/BajRfxOs+R2MKA== dependencies: - "@types/jest" "26.x" bs-logger "0.x" buffer-from "1.x" fast-json-stable-stringify "2.x" @@ -4029,9 +4000,9 @@ ts-jest@^26.5.2: yargs-parser "20.x" ts-loader@^8.0.17: - version "8.0.17" - resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.17.tgz#98f2ccff9130074f4079fd89b946b4c637b1f2fc" - integrity sha512-OeVfSshx6ot/TCxRwpBHQ/4lRzfgyTkvi7ghDVrLXOHzTbSK413ROgu/xNqM72i3AFeAIJgQy78FwSMKmOW68w== + version "8.2.0" + resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.2.0.tgz#6a3aeaa378aecda543e2ed2c332d3123841d52e0" + integrity sha512-ebXBFrNyMSmbWgjnb3WBloUBK+VSx1xckaXsMXxlZRDqce/OPdYBVN5efB0W3V0defq0Gcy4YuzvPGqRgjj85A== dependencies: chalk "^4.1.0" enhanced-resolve "^4.0.0" @@ -4039,7 +4010,7 @@ ts-loader@^8.0.17: micromatch "^4.0.0" semver "^7.3.4" -tslib@^1.13.0, tslib@^1.8.1, tslib@^1.9.0: +tslib@^1.13.0, tslib@^1.8.1: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== @@ -4094,10 +4065,10 @@ type-detect@4.0.8: resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== -type-fest@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" - integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== +type-fest@^0.21.3: + version "0.21.3" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" + integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== type-fest@^0.6.0: version "0.6.0" @@ -4117,9 +4088,9 @@ typedarray-to-buffer@^3.1.5: is-typedarray "^1.0.0" typescript@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.2.tgz#1450f020618f872db0ea17317d16d8da8ddb8c4c" - integrity sha512-tbb+NVrLfnsJy3M59lsDgrzWIflR4d4TIUjz+heUnHZwdF7YsrMTKoRERiIvI2lvBG95dfpLxB21WZhys1bgaQ== + version "4.2.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961" + integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg== union-value@^1.0.0: version "1.0.1" @@ -4131,6 +4102,11 @@ union-value@^1.0.0: is-extendable "^0.1.1" set-value "^2.0.1" +universalify@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" + integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== + unset-value@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" @@ -4172,14 +4148,14 @@ uuid@^8.3.0: integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== v8-compile-cache@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132" - integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q== + version "2.3.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" + integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== v8-to-istanbul@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.0.tgz#5b95cef45c0f83217ec79f8fc7ee1c8b486aee07" - integrity sha512-uXUVqNUCLa0AH1vuVxzi+MI4RfxEOKt9pBgKwHbgH7st8Kv2P1m+jvWNnektzBh5QShF3ODgKmUFCf38LnVz1g== + version "7.1.2" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz#30898d1a7fa0c84d225a2c1434fb958f290883c1" + integrity sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow== dependencies: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" @@ -4242,17 +4218,16 @@ webidl-conversions@^6.1.0: integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== webpack-cli@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.5.0.tgz#b5213b84adf6e1f5de6391334c9fa53a48850466" - integrity sha512-wXg/ef6Ibstl2f50mnkcHblRPN/P9J4Nlod5Hg9HGFgSeF8rsqDGHJeVe4aR26q9l62TUJi6vmvC2Qz96YJw1Q== + version "4.7.0" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.7.0.tgz#3195a777f1f802ecda732f6c95d24c0004bc5a35" + integrity sha512-7bKr9182/sGfjFm+xdZSwgQuFjgEcy0iCTIBxRUeteJ2Kr8/Wz0qNJX+jw60LU36jApt4nmMkep6+W5AKhok6g== dependencies: "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^1.0.1" - "@webpack-cli/info" "^1.2.2" - "@webpack-cli/serve" "^1.3.0" + "@webpack-cli/configtest" "^1.0.3" + "@webpack-cli/info" "^1.2.4" + "@webpack-cli/serve" "^1.4.0" colorette "^1.2.1" commander "^7.0.0" - enquirer "^2.3.6" execa "^5.0.0" fastest-levenshtein "^1.0.12" import-local "^3.0.2" @@ -4278,19 +4253,19 @@ webpack-sources@^2.1.1: source-map "^0.6.1" webpack@^5.24.1: - version "5.24.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.24.1.tgz#6b7730bfba1ee94b05d05ef7c32743a35105a744" - integrity sha512-eg+6OIt6npUSwbhRQY6XffAixEUSARBf+WAWOxrZwOB4jRbbpMXlridFy/Yt7N0U20Ry1vp/nnDbtN7l1rUdIA== + version "5.37.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.37.0.tgz#2ab00f613faf494504eb2beef278dab7493cc39d" + integrity sha512-yvdhgcI6QkQkDe1hINBAJ1UNevqNGTVaCkD2SSJcB8rcrNNl922RI8i2DXUAuNfANoxwsiXXEA4ZPZI9q2oGLA== dependencies: "@types/eslint-scope" "^3.7.0" - "@types/estree" "^0.0.46" + "@types/estree" "^0.0.47" "@webassemblyjs/ast" "1.11.0" "@webassemblyjs/wasm-edit" "1.11.0" "@webassemblyjs/wasm-parser" "1.11.0" - acorn "^8.0.4" + acorn "^8.2.1" browserslist "^4.14.5" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.7.0" + enhanced-resolve "^5.8.0" es-module-lexer "^0.4.0" eslint-scope "^5.1.1" events "^3.2.0" @@ -4318,12 +4293,12 @@ whatwg-mimetype@^2.3.0: resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== -whatwg-url@^8.0.0: - version "8.4.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz#50fb9615b05469591d2b2bd6dfaed2942ed72837" - integrity sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw== +whatwg-url@^8.0.0, whatwg-url@^8.5.0: + version "8.5.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.5.0.tgz#7752b8464fc0903fec89aa9846fc9efe07351fd3" + integrity sha512-fy+R77xWv0AiqfLl4nuGUlQ3/6b5uNfQ4WAbGQVMYshCTCCPK9psC1nWh3XHuxGVCtlcDDQPQW1csmmIQo+fwg== dependencies: - lodash.sortby "^4.7.0" + lodash "^4.7.0" tr46 "^2.0.2" webidl-conversions "^6.1.0" @@ -4389,10 +4364,10 @@ write-file-atomic@^3.0.0: signal-exit "^3.0.2" typedarray-to-buffer "^3.1.5" -ws@^7.2.3: - version "7.4.3" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.3.tgz#1f9643de34a543b8edb124bdcbc457ae55a6e5cd" - integrity sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA== +ws@^7.4.4: + version "7.4.5" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1" + integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g== xml-name-validator@^3.0.0: version "3.0.0" @@ -4410,14 +4385,14 @@ xmlchars@^2.2.0: integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== y18n@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4" - integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ== + version "4.0.3" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" + integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ== y18n@^5.0.5: - version "5.0.5" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18" - integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg== + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== yallist@^4.0.0: version "4.0.0" @@ -4425,9 +4400,9 @@ yallist@^4.0.0: integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== yargs-parser@20.x, yargs-parser@^20.2.2: - version "20.2.6" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.6.tgz#69f920addf61aafc0b8b89002f5d66e28f2d8b20" - integrity sha512-AP1+fQIWSM/sMiET8fyayjx/J+JmTPt2Mr0FkrgqB4todtfa53sOsrSAcIrJRD5XS20bKUwaDIuMkWKCEiQLKA== + version "20.2.7" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a" + integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw== yargs-parser@^18.1.2: version "18.1.3" diff --git a/src/SignalR/clients/ts/signalr-protocol-msgpack/yarn.lock b/src/SignalR/clients/ts/signalr-protocol-msgpack/yarn.lock index 1d258198b0a8..d6e1ada34c6e 100644 --- a/src/SignalR/clients/ts/signalr-protocol-msgpack/yarn.lock +++ b/src/SignalR/clients/ts/signalr-protocol-msgpack/yarn.lock @@ -7,9 +7,9 @@ uid "" "@msgpack/msgpack@^2.4.0": - version "2.4.0" - resolved "https://registry.yarnpkg.com/@msgpack/msgpack/-/msgpack-2.4.0.tgz#789c69301388a6a44a47ce654014ecd1703c8fcc" - integrity sha512-5qzv53J43V8GaYsaETs29Q0Ehw9Dog6SG18MASZRQDuZYXtA5T7pymGE2S40NL0X8sjl8+TybmRa5O8d45V7MQ== + version "2.6.3" + resolved "https://registry.yarnpkg.com/@msgpack/msgpack/-/msgpack-2.6.3.tgz#e0e3cdac43500624ee5a0f2f2503351d5862e46c" + integrity sha512-dSJ1TBB9Hreienm5SFVbpKIcRRekQNULxvbmDVXQwRCZWYCIxZ23X+FlFWkg1LmGG+DIQZXH+2IW01QwxofT/g== abort-controller@^3.0.0: version "3.0.0" @@ -24,9 +24,9 @@ event-target-shim@^5.0.0: integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ== eventsource@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0" - integrity sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ== + version "1.1.0" + resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.0.tgz#00e8ca7c92109e94b0ddf32dac677d841028cfaf" + integrity sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg== dependencies: original "^1.0.0" @@ -92,6 +92,6 @@ url-parse@^1.4.3: requires-port "^1.0.0" ws@^7.4.3: - version "7.4.3" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.3.tgz#1f9643de34a543b8edb124bdcbc457ae55a6e5cd" - integrity sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA== + version "7.4.5" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1" + integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g== diff --git a/src/SignalR/clients/ts/signalr/package.json b/src/SignalR/clients/ts/signalr/package.json index 8b10bac941a8..9fe4bfee9ebe 100644 --- a/src/SignalR/clients/ts/signalr/package.json +++ b/src/SignalR/clients/ts/signalr/package.json @@ -54,10 +54,10 @@ "process": "^0.11.10" }, "dependencies": { - "eventsource": "^1.0.7", - "node-fetch": "^2.6.1", "abort-controller": "^3.0.0", + "eventsource": "^1.0.7", "fetch-cookie": "^0.11.0", - "ws": "^7.4.3" + "node-fetch": "^2.6.1", + "ws": "^7.4.5" } } diff --git a/src/SignalR/clients/ts/signalr/yarn.lock b/src/SignalR/clients/ts/signalr/yarn.lock index 88c28057d5af..40f7f28a367c 100644 --- a/src/SignalR/clients/ts/signalr/yarn.lock +++ b/src/SignalR/clients/ts/signalr/yarn.lock @@ -38,17 +38,22 @@ "@types/istanbul-lib-report" "*" "@types/jest@^26.0.20": - version "26.0.20" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.20.tgz#cd2f2702ecf69e86b586e1f5223a60e454056307" - integrity sha512-9zi2Y+5USJRxd0FsahERhBwlcvFh6D2GLQnY2FH2BzK8J9s9omvNHIbvABwIluXa0fD8XVKMLTO0aOEuUfACAA== + version "26.0.23" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.23.tgz#a1b7eab3c503b80451d019efb588ec63522ee4e7" + integrity sha512-ZHLmWMJ9jJ9PTiT58juykZpL7KjwJywFN3Rr2pTSkyQfydf/rk22yS7W8p5DaVUMQ2BQC7oYiU3FjbTM/mYrOA== dependencies: jest-diff "^26.0.0" pretty-format "^26.0.0" -"@types/node@*", "@types/node@^14.14.31": - version "14.14.31" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.31.tgz#72286bd33d137aa0d152d47ec7c1762563d34055" - integrity sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g== +"@types/node@*": + version "15.0.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz#51e9c0920d1b45936ea04341aa3e2e58d339fb67" + integrity sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA== + +"@types/node@^14.14.31": + version "14.14.44" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.44.tgz#df7503e6002847b834371c004b372529f3f85215" + integrity sha512-+gaugz6Oce6ZInfI/tK4Pq5wIIkJMEJUu92RB3Eu93mtj4wjjjz9EB5mLp5s1pSsLXdC/CPut/xF20ZzAQJbTA== "@types/tough-cookie@^4.0.0": version "4.0.0" @@ -87,9 +92,9 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: color-convert "^2.0.1" chalk@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" - integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== + version "4.1.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" + integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" @@ -117,9 +122,9 @@ event-target-shim@^5.0.0: integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ== eventsource@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0" - integrity sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ== + version "1.1.0" + resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.0.tgz#00e8ca7c92109e94b0ddf32dac677d841028cfaf" + integrity sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg== dependencies: original "^1.0.0" @@ -193,9 +198,9 @@ querystringify@^2.1.1: integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== react-is@^17.0.1: - version "17.0.1" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339" - integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA== + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" + integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== requires-port@^1.0.0: version "1.0.0" @@ -231,7 +236,7 @@ url-parse@^1.4.3: querystringify "^2.1.1" requires-port "^1.0.0" -ws@^7.4.3: - version "7.4.3" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.3.tgz#1f9643de34a543b8edb124bdcbc457ae55a6e5cd" - integrity sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA== +ws@7.4.5: + version "7.4.5" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1" + integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g== From c6f79700d4310e04aaa98cfac8f697fcb3d582bd Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Wed, 12 May 2021 13:16:51 -0700 Subject: [PATCH 14/30] Undo bad merge to fix up Helix builds (#32618) --- eng/common/tools.ps1 | 6 +++--- .../src/Microsoft.AspNetCore.Components.WebAssembly.csproj | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index c6482608c584..b03d1c26233b 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -374,7 +374,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = } $msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" } - return $global:_MSBuildExe = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin\amd64\msbuild.exe" + return $global:_MSBuildExe = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin\msbuild.exe" } function InitializeVisualStudioEnvironmentVariables([string] $vsInstallDir, [string] $vsMajorVersion) { @@ -498,7 +498,7 @@ function InitializeBuildTool() { if (Test-Path variable:global:_BuildTool) { # If the requested msbuild parameters do not match, clear the cached variables. if($global:_BuildTool.Contains('ExcludePrereleaseVS') -and $global:_BuildTool.ExcludePrereleaseVS -ne $excludePrereleaseVS) { - Remove-Item variable:global:_BuildTool + Remove-Item variable:global:_BuildTool Remove-Item variable:global:_MSBuildExe } else { return $global:_BuildTool @@ -555,7 +555,7 @@ function GetDefaultMSBuildEngine() { function GetNuGetPackageCachePath() { if ($env:NUGET_PACKAGES -eq $null) { - # Use local cache on CI to ensure deterministic build. + # Use local cache on CI to ensure deterministic build. # Avoid using the http cache as workaround for https://github.com/NuGet/Home/issues/3116 # use global cache in dev builds to avoid cost of downloading packages. # For directory normalization, see also: https://github.com/NuGet/Home/issues/7968 diff --git a/src/Components/WebAssembly/WebAssembly/src/Microsoft.AspNetCore.Components.WebAssembly.csproj b/src/Components/WebAssembly/WebAssembly/src/Microsoft.AspNetCore.Components.WebAssembly.csproj index 8226bec99b90..86a4dce4ae66 100644 --- a/src/Components/WebAssembly/WebAssembly/src/Microsoft.AspNetCore.Components.WebAssembly.csproj +++ b/src/Components/WebAssembly/WebAssembly/src/Microsoft.AspNetCore.Components.WebAssembly.csproj @@ -3,7 +3,6 @@ $(DefaultNetCoreTargetFramework) Build client-side single-page applications (SPAs) with Blazor running under WebAssembly. - false $(NoWarn);BL0006 true enable From ea2895d0cf12a2c27457236f1758e7b4d7809525 Mon Sep 17 00:00:00 2001 From: Tanay Parikh Date: Wed, 12 May 2021 15:00:55 -0700 Subject: [PATCH 15/30] Unquarantine CanSendAndReceiveBytes (#32281) * Unquarantine CanSendAndReceiveBytes * Ensure independent browser instances --- src/Components/test/E2ETest/Tests/BinaryHttpClientTest.cs | 4 +++- src/Components/test/E2ETest/Tests/PerformanceTest.cs | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Components/test/E2ETest/Tests/BinaryHttpClientTest.cs b/src/Components/test/E2ETest/Tests/BinaryHttpClientTest.cs index c4a453ecee66..151ce965581c 100644 --- a/src/Components/test/E2ETest/Tests/BinaryHttpClientTest.cs +++ b/src/Components/test/E2ETest/Tests/BinaryHttpClientTest.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Threading.Tasks; using BasicTestApp.HttpClientTest; using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures; using Microsoft.AspNetCore.E2ETesting; @@ -42,8 +43,9 @@ protected override void InitializeAsyncCore() _appElement = Browser.MountTestComponent(); } + public override Task InitializeAsync() => base.InitializeAsync(Guid.NewGuid().ToString()); + [Fact] - [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/23366")] public void CanSendAndReceiveBytes() { IssueRequest("/subdir/api/data"); diff --git a/src/Components/test/E2ETest/Tests/PerformanceTest.cs b/src/Components/test/E2ETest/Tests/PerformanceTest.cs index ef6a8e0c54d5..82495418a01e 100644 --- a/src/Components/test/E2ETest/Tests/PerformanceTest.cs +++ b/src/Components/test/E2ETest/Tests/PerformanceTest.cs @@ -3,6 +3,7 @@ using System; using System.Linq; +using System.Threading.Tasks; using Microsoft.AspNetCore.Components.E2ETest.Infrastructure; using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures; using Microsoft.AspNetCore.E2ETesting; @@ -29,6 +30,8 @@ protected override void InitializeAsyncCore() Navigate("/", noReload: true); } + public override Task InitializeAsync() => base.InitializeAsync(Guid.NewGuid().ToString()); + [Fact] public void HasTitle() { From badf48e408bc4c7461e9e715414d16712c713692 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 12 May 2021 22:17:36 +0000 Subject: [PATCH 16/30] [main] Update dependencies from dotnet/runtime dotnet/emsdk (#32613) [main] Update dependencies from dotnet/runtime dotnet/emsdk --- eng/Version.Details.xml | 252 ++++++++++++++++++++-------------------- eng/Versions.props | 126 ++++++++++---------- 2 files changed, 189 insertions(+), 189 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ab6badc9b959..877bd78a4dcf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,264 +41,264 @@ https://github.com/dotnet/efcore 7249f629c2c992c0173994032ebc5af5f9b5d542 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/emsdk - 1d115709972f58def7b7394fa03f69be78f427a3 + 411d8383281e4f9f2983b832593e85f9e6e7bbc6 - + https://github.com/dotnet/emsdk - 1d115709972f58def7b7394fa03f69be78f427a3 + 411d8383281e4f9f2983b832593e85f9e6e7bbc6 - + https://github.com/dotnet/emsdk - 1d115709972f58def7b7394fa03f69be78f427a3 + 411d8383281e4f9f2983b832593e85f9e6e7bbc6 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 - + https://github.com/dotnet/runtime - 05b646c85e2d3cfb0f95a4c700238a560477144a + b4f4418d56d32c3a1677b5651899a112d7e02226 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index ecbe26e1d9c9..b25ac9cbb716 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,70 +65,70 @@ --> - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21226.1 - 6.0.0-preview.5.21226.1 - 6.0.0-preview.5.21226.1 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 - 6.0.0-preview.5.21260.8 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21260.8 + 6.0.0-preview.5.21262.1 6.0.0-preview.5.21260.5 6.0.0-preview.5.21260.5 From 350cf6bd715e55b4da88ad2e9a843255dd547a5c Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Thu, 13 May 2021 11:27:07 +1200 Subject: [PATCH 17/30] SkipLocalsInit on methods with stackalloc (#32567) * SkipLocalsInit on Kestrel methods with stackalloc * Clean up * Fixes * Fix tests * PR feedback --- ...icrosoft.AspNetCore.DataProtection.Abstractions.csproj | 1 + src/Http/Routing/src/Matching/DfaMatcher.cs | 2 ++ src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj | 1 + src/Http/WebUtilities/src/FormPipeReader.cs | 3 ++- .../src/Microsoft.AspNetCore.WebUtilities.csproj | 1 + .../Kestrel/Core/src/Internal/Http/HttpRequestHeaders.cs | 1 + .../Kestrel/Core/src/Internal/Http2/Http2Stream.cs | 3 ++- .../Kestrel/Core/src/Internal/Http3/Http3Stream.cs | 4 +++- .../src/Internal/Infrastructure/KestrelEventSource.cs | 1 + src/Shared/WebEncoders/WebEncoders.cs | 8 ++++++-- .../src/Microsoft.AspNetCore.Http.Connections.csproj | 3 ++- 11 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/DataProtection/Abstractions/src/Microsoft.AspNetCore.DataProtection.Abstractions.csproj b/src/DataProtection/Abstractions/src/Microsoft.AspNetCore.DataProtection.Abstractions.csproj index 55e687fa18e4..c2983188e440 100644 --- a/src/DataProtection/Abstractions/src/Microsoft.AspNetCore.DataProtection.Abstractions.csproj +++ b/src/DataProtection/Abstractions/src/Microsoft.AspNetCore.DataProtection.Abstractions.csproj @@ -7,6 +7,7 @@ Microsoft.AspNetCore.DataProtection.IDataProtectionProvider Microsoft.AspNetCore.DataProtection.IDataProtector $(DefaultNetFxTargetFramework);netstandard2.0;$(DefaultNetCoreTargetFramework) true + true true aspnetcore;dataprotection enable diff --git a/src/Http/Routing/src/Matching/DfaMatcher.cs b/src/Http/Routing/src/Matching/DfaMatcher.cs index 9cc6ae2ab94f..106db18bc860 100644 --- a/src/Http/Routing/src/Matching/DfaMatcher.cs +++ b/src/Http/Routing/src/Matching/DfaMatcher.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; +using System.Runtime.CompilerServices; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Routing.Patterns; @@ -27,6 +28,7 @@ public DfaMatcher(ILogger logger, EndpointSelector selector, DfaStat _isDefaultEndpointSelector = selector is DefaultEndpointSelector; } + [SkipLocalsInit] public sealed override Task MatchAsync(HttpContext httpContext) { if (httpContext == null) diff --git a/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj b/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj index 36c0bacc92f1..10796dab2067 100644 --- a/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj +++ b/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj @@ -7,6 +7,7 @@ Microsoft.AspNetCore.Routing.Route Microsoft.AspNetCore.Routing.RouteCollection $(DefaultNetCoreTargetFramework) true + true true aspnetcore;routing false diff --git a/src/Http/WebUtilities/src/FormPipeReader.cs b/src/Http/WebUtilities/src/FormPipeReader.cs index a902bdea349e..92c340f973ae 100644 --- a/src/Http/WebUtilities/src/FormPipeReader.cs +++ b/src/Http/WebUtilities/src/FormPipeReader.cs @@ -332,6 +332,7 @@ private void ThrowValueTooLargeException() throw new InvalidDataException($"Form value length limit {ValueLengthLimit} exceeded."); } + [SkipLocalsInit] private string GetDecodedStringFromReadOnlySequence(in ReadOnlySequence ros) { if (ros.IsSingleSegment) @@ -341,7 +342,7 @@ private string GetDecodedStringFromReadOnlySequence(in ReadOnlySequence ro if (ros.Length < StackAllocThreshold) { - Span buffer = stackalloc byte[(int)ros.Length]; + Span buffer = stackalloc byte[StackAllocThreshold].Slice(0, (int)ros.Length); ros.CopyTo(buffer); return GetDecodedString(buffer); } diff --git a/src/Http/WebUtilities/src/Microsoft.AspNetCore.WebUtilities.csproj b/src/Http/WebUtilities/src/Microsoft.AspNetCore.WebUtilities.csproj index 95b496204d4e..3e3560224e2d 100644 --- a/src/Http/WebUtilities/src/Microsoft.AspNetCore.WebUtilities.csproj +++ b/src/Http/WebUtilities/src/Microsoft.AspNetCore.WebUtilities.csproj @@ -5,6 +5,7 @@ $(DefaultNetCoreTargetFramework) true $(DefineConstants);WebEncoders_In_WebUtilities + true true aspnetcore false diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpRequestHeaders.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpRequestHeaders.cs index 0a3e43bd47e2..d0f8e816474b 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/HttpRequestHeaders.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/HttpRequestHeaders.cs @@ -96,6 +96,7 @@ private void AppendContentLength(ReadOnlySpan value) } [MethodImpl(MethodImplOptions.NoInlining)] + [SkipLocalsInit] private void AppendContentLengthCustomEncoding(ReadOnlySpan value, Encoding? customEncoding) { if (_contentLength.HasValue) diff --git a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Stream.cs b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Stream.cs index 28dc06ff310a..0c7b8470ad6a 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Stream.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Stream.cs @@ -352,10 +352,11 @@ private bool TryValidateAuthorityAndHost(out string hostText) return true; } + [SkipLocalsInit] private bool TryValidatePath(ReadOnlySpan pathSegment) { // Must start with a leading slash - if (pathSegment.Length == 0 || pathSegment[0] != '/') + if (pathSegment.IsEmpty || pathSegment[0] != '/') { ResetAndAbort(new ConnectionAbortedException(CoreStrings.FormatHttp2StreamErrorPathInvalid(RawTarget)), Http2ErrorCode.PROTOCOL_ERROR); return false; diff --git a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Stream.cs b/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Stream.cs index 0a6470ca6777..08f6033f8bfe 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Stream.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Stream.cs @@ -7,6 +7,7 @@ using System.IO.Pipelines; using System.Net.Http; using System.Net.Http.QPack; +using System.Runtime.CompilerServices; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; @@ -739,10 +740,11 @@ private bool TryValidateAuthorityAndHost(out string hostText) return true; } + [SkipLocalsInit] private bool TryValidatePath(ReadOnlySpan pathSegment) { // Must start with a leading slash - if (pathSegment.Length == 0 || pathSegment[0] != '/') + if (pathSegment.IsEmpty || pathSegment[0] != '/') { Abort(new ConnectionAbortedException(CoreStrings.FormatHttp3StreamErrorPathInvalid(RawTarget)), Http3ErrorCode.ProtocolError); return false; diff --git a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelEventSource.cs b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelEventSource.cs index 8874eb529715..4c87cc2de792 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelEventSource.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelEventSource.cs @@ -301,6 +301,7 @@ protected override void OnEventCommand(EventCommandEventArgs command) } [NonEvent] + [SkipLocalsInit] private unsafe void WriteEvent(int eventId, string? arg1, string? arg2, string? arg3, string? arg4, string? arg5) { const int EventDataCount = 5; diff --git a/src/Shared/WebEncoders/WebEncoders.cs b/src/Shared/WebEncoders/WebEncoders.cs index ccad3bfc9379..86798884a070 100644 --- a/src/Shared/WebEncoders/WebEncoders.cs +++ b/src/Shared/WebEncoders/WebEncoders.cs @@ -8,6 +8,7 @@ #endif using System.Diagnostics; using System.Globalization; +using System.Runtime.CompilerServices; using Microsoft.Extensions.WebEncoders.Sources; #if WebEncoders_In_WebUtilities @@ -343,8 +344,11 @@ public static int GetArraySizeRequiredToEncode(int count) /// /// The binary input to encode. /// The base64url-encoded form of . + [SkipLocalsInit] public static string Base64UrlEncode(ReadOnlySpan input) { + const int StackAllocThreshold = 128; + if (input.IsEmpty) { return string.Empty; @@ -353,8 +357,8 @@ public static string Base64UrlEncode(ReadOnlySpan input) int bufferSize = GetArraySizeRequiredToEncode(input.Length); char[]? bufferToReturnToPool = null; - Span buffer = bufferSize <= 128 - ? stackalloc char[bufferSize] + Span buffer = bufferSize <= StackAllocThreshold + ? stackalloc char[StackAllocThreshold] : bufferToReturnToPool = ArrayPool.Shared.Rent(bufferSize); var numBase64Chars = Base64UrlEncode(input, buffer); diff --git a/src/SignalR/common/Http.Connections/src/Microsoft.AspNetCore.Http.Connections.csproj b/src/SignalR/common/Http.Connections/src/Microsoft.AspNetCore.Http.Connections.csproj index 90e1daef0094..d4493eb60205 100644 --- a/src/SignalR/common/Http.Connections/src/Microsoft.AspNetCore.Http.Connections.csproj +++ b/src/SignalR/common/Http.Connections/src/Microsoft.AspNetCore.Http.Connections.csproj @@ -1,9 +1,10 @@ - + Components for providing real-time bi-directional communication across the Web. $(DefaultNetCoreTargetFramework) true + true false enable From bc5960e878140bc90484be799123ea1f25af0ba2 Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Wed, 12 May 2021 17:46:13 -0700 Subject: [PATCH 18/30] Fix commands for opening browsers on macOS (#32627) --- src/Components/WebAssembly/Server/src/TargetPickerUi.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Components/WebAssembly/Server/src/TargetPickerUi.cs b/src/Components/WebAssembly/Server/src/TargetPickerUi.cs index 100d9a48ebaf..553b9905f869 100644 --- a/src/Components/WebAssembly/Server/src/TargetPickerUi.cs +++ b/src/Components/WebAssembly/Server/src/TargetPickerUi.cs @@ -175,7 +175,7 @@ private string GetLaunchChromeInstructions(string targetApplicationUrl) else if (OperatingSystem.IsMacOS()) { return $@"

Execute the following:

-

open /Applications/Google\ Chrome.app --args --remote-debugging-port={debuggerPort} --user-data-dir={profilePath} {targetApplicationUrl}

"; +

open -n /Applications/Google\ Chrome.app --args --remote-debugging-port={debuggerPort} --user-data-dir={profilePath} {targetApplicationUrl}

"; } else { @@ -196,7 +196,7 @@ private string GetLaunchEdgeInstructions(string targetApplicationUrl) else if (OperatingSystem.IsMacOS()) { return $@"

In a terminal window execute the following:

-

open /Applications/Microsoft\ Edge\ Dev.app --args --remote-debugging-port={debuggerPort} --user-data-dir={profilePath} {targetApplicationUrl}

"; +

open -n /Applications/Microsoft\ Edge.app --args --remote-debugging-port={debuggerPort} --user-data-dir={profilePath} {targetApplicationUrl}

"; } else { From 9fa86b31f5bb0342e7a6cd5a7dc956b73b06f392 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Thu, 13 May 2021 15:03:14 +1200 Subject: [PATCH 19/30] Make trailers safer in TestHost (#32633) --- src/Hosting/TestHost/src/ClientHandler.cs | 12 ++++++++---- src/Hosting/TestHost/src/HttpContextBuilder.cs | 7 ++++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/Hosting/TestHost/src/ClientHandler.cs b/src/Hosting/TestHost/src/ClientHandler.cs index 299b84bea6bd..075b9de2d39e 100644 --- a/src/Hosting/TestHost/src/ClientHandler.cs +++ b/src/Hosting/TestHost/src/ClientHandler.cs @@ -184,12 +184,16 @@ protected override async Task SendAsync( // Copy trailers to the response message when the response stream is complete contextBuilder.RegisterResponseReadCompleteCallback(context => { - var responseTrailersFeature = context.Features.Get()!; + var responseTrailersFeature = context.Features.Get(); - foreach (var trailer in responseTrailersFeature.Trailers) + // Trailers collection is settable so double check the app hasn't set it to null. + if (responseTrailersFeature?.Trailers != null) { - bool success = response.TrailingHeaders.TryAddWithoutValidation(trailer.Key, (IEnumerable)trailer.Value); - Contract.Assert(success, "Bad trailer"); + foreach (var trailer in responseTrailersFeature.Trailers) + { + bool success = response.TrailingHeaders.TryAddWithoutValidation(trailer.Key, (IEnumerable)trailer.Value); + Contract.Assert(success, "Bad trailer"); + } } }); diff --git a/src/Hosting/TestHost/src/HttpContextBuilder.cs b/src/Hosting/TestHost/src/HttpContextBuilder.cs index ef9b6e5faee3..37e114a50f9c 100644 --- a/src/Hosting/TestHost/src/HttpContextBuilder.cs +++ b/src/Hosting/TestHost/src/HttpContextBuilder.cs @@ -47,7 +47,7 @@ internal HttpContextBuilder(ApplicationWrapper application, bool allowSynchronou _requestPipe = new Pipe(); var responsePipe = new Pipe(); - _responseReaderStream = new ResponseBodyReaderStream(responsePipe, ClientInitiatedAbort, () => _responseReadCompleteCallback?.Invoke(_httpContext)); + _responseReaderStream = new ResponseBodyReaderStream(responsePipe, ClientInitiatedAbort, ResponseBodyReadComplete); _responsePipeWriter = new ResponseBodyPipeWriter(responsePipe, ReturnResponseMessageAsync); _responseFeature.Body = new ResponseBodyWriterStream(_responsePipeWriter, () => AllowSynchronousIO); _responseFeature.BodyWriter = _responsePipeWriter; @@ -180,6 +180,11 @@ internal void ClientInitiatedAbort() CancelRequestBody(); } + private void ResponseBodyReadComplete() + { + _responseReadCompleteCallback?.Invoke(_httpContext); + } + private bool RequestBodyReadInProgress() { try From d8906c8523f071371ce95d4e2d2fdfa89858047e Mon Sep 17 00:00:00 2001 From: Brennan Date: Wed, 12 May 2021 22:07:52 -0700 Subject: [PATCH 20/30] Enable Redis unit tests (#32601) --- .../src/HubLifetimeManagerTestBase.cs | 12 ++--- .../test/RedisHubLifetimeManagerTests.cs | 24 +++++++-- .../test/TestConnectionMultiplexer.cs | 50 +++++++++++++------ 3 files changed, 63 insertions(+), 23 deletions(-) diff --git a/src/SignalR/server/Specification.Tests/src/HubLifetimeManagerTestBase.cs b/src/SignalR/server/Specification.Tests/src/HubLifetimeManagerTestBase.cs index 10699dd8f7ec..26bf3cad6b93 100644 --- a/src/SignalR/server/Specification.Tests/src/HubLifetimeManagerTestBase.cs +++ b/src/SignalR/server/Specification.Tests/src/HubLifetimeManagerTestBase.cs @@ -47,12 +47,12 @@ public async Task SendAllAsyncWritesToAllConnectionsOutput() await manager.SendAllAsync("Hello", new object[] { "World" }).DefaultTimeout(); - var message = Assert.IsType(client1.TryRead()); + var message = Assert.IsType(await client1.ReadAsync().DefaultTimeout()); Assert.Equal("Hello", message.Target); Assert.Single(message.Arguments); Assert.Equal("World", (string)message.Arguments[0]); - message = Assert.IsType(client2.TryRead()); + message = Assert.IsType(await client2.ReadAsync().DefaultTimeout()); Assert.Equal("Hello", message.Target); Assert.Single(message.Arguments); Assert.Equal("World", (string)message.Arguments[0]); @@ -80,7 +80,7 @@ public async Task SendAllAsyncDoesNotWriteToDisconnectedConnectionsOutput() await manager.SendAllAsync("Hello", new object[] { "World" }).DefaultTimeout(); - var message = Assert.IsType(client1.TryRead()); + var message = Assert.IsType(await client1.ReadAsync().DefaultTimeout()); Assert.Equal("Hello", message.Target); Assert.Single(message.Arguments); Assert.Equal("World", (string)message.Arguments[0]); @@ -110,7 +110,7 @@ public async Task SendGroupAsyncWritesToAllConnectionsInGroupOutput() await manager.SendGroupAsync("group", "Hello", new object[] { "World" }).DefaultTimeout(); - var message = Assert.IsType(client1.TryRead()); + var message = Assert.IsType(await client1.ReadAsync().DefaultTimeout()); Assert.Equal("Hello", message.Target); Assert.Single(message.Arguments); Assert.Equal("World", (string)message.Arguments[0]); @@ -141,7 +141,7 @@ public async Task SendGroupExceptAsyncDoesNotWriteToExcludedConnections() await manager.SendGroupExceptAsync("group1", "Hello", new object[] { "World" }, new[] { connection2.ConnectionId }).DefaultTimeout(); - var message = Assert.IsType(client1.TryRead()); + var message = Assert.IsType(await client1.ReadAsync().DefaultTimeout()); Assert.Equal("Hello", message.Target); Assert.Single(message.Arguments); Assert.Equal("World", (string)message.Arguments[0]); @@ -166,7 +166,7 @@ public async Task SendConnectionAsyncWritesToConnectionOutput() await manager.SendConnectionAsync(connection.ConnectionId, "Hello", new object[] { "World" }).DefaultTimeout(); - var message = Assert.IsType(client.TryRead()); + var message = Assert.IsType(await client.ReadAsync().DefaultTimeout()); Assert.Equal("Hello", message.Target); Assert.Single(message.Arguments); Assert.Equal("World", (string)message.Arguments[0]); diff --git a/src/SignalR/server/StackExchangeRedis/test/RedisHubLifetimeManagerTests.cs b/src/SignalR/server/StackExchangeRedis/test/RedisHubLifetimeManagerTests.cs index 02ce85234ecf..646fbb9c2ac9 100644 --- a/src/SignalR/server/StackExchangeRedis/test/RedisHubLifetimeManagerTests.cs +++ b/src/SignalR/server/StackExchangeRedis/test/RedisHubLifetimeManagerTests.cs @@ -4,6 +4,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR.Internal; using Microsoft.AspNetCore.SignalR.Protocol; +using Microsoft.AspNetCore.SignalR.Specification.Tests; using Microsoft.AspNetCore.SignalR.Tests; using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.Logging.Abstractions; @@ -14,9 +15,10 @@ namespace Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests { - // Add ScaleoutHubLifetimeManagerTests back after https://github.com/aspnet/SignalR/issues/3088 - public class RedisHubLifetimeManagerTests + public class RedisHubLifetimeManagerTests : ScaleoutHubLifetimeManagerTests { + private TestRedisServer _server; + public class TestObject { public string TestProperty { get; set; } @@ -37,7 +39,7 @@ private RedisHubLifetimeManager CreateLifetimeManager(TestRedisServer serve }, NullLogger.Instance)); } - [Fact(Skip = "https://github.com/aspnet/SignalR/issues/3088")] + [Fact] public async Task CamelCasedJsonIsPreservedAcrossRedisBoundary() { var server = new TestRedisServer(); @@ -80,5 +82,21 @@ public async Task CamelCasedJsonIsPreservedAcrossRedisBoundary() }); } } + + public override TestRedisServer CreateBackplane() + { + return new TestRedisServer(); + } + + public override HubLifetimeManager CreateNewHubLifetimeManager() + { + _server = new TestRedisServer(); + return CreateLifetimeManager(_server); + } + + public override HubLifetimeManager CreateNewHubLifetimeManager(TestRedisServer backplane) + { + return CreateLifetimeManager(backplane); + } } } diff --git a/src/SignalR/server/StackExchangeRedis/test/TestConnectionMultiplexer.cs b/src/SignalR/server/StackExchangeRedis/test/TestConnectionMultiplexer.cs index 664316c469a8..1cfeb6237a77 100644 --- a/src/SignalR/server/StackExchangeRedis/test/TestConnectionMultiplexer.cs +++ b/src/SignalR/server/StackExchangeRedis/test/TestConnectionMultiplexer.cs @@ -6,6 +6,8 @@ using System.Collections.Generic; using System.IO; using System.Net; +using System.Reflection; +using System.Threading; using System.Threading.Tasks; using StackExchange.Redis; using StackExchange.Redis.Profiling; @@ -73,11 +75,11 @@ public event EventHandler HashSlotMoved remove { } } - private readonly ISubscriber _subscriber; + private readonly TestRedisServer _server; public TestConnectionMultiplexer(TestRedisServer server) { - _subscriber = new TestSubscriber(server); + _server = server; } public void BeginProfiling(object forContext) @@ -167,7 +169,7 @@ public string GetStormLog() public ISubscriber GetSubscriber(object asyncState = null) { - return _subscriber; + return new TestSubscriber(_server); } public int HashSlot(RedisKey key) @@ -223,14 +225,14 @@ public void ExportConfiguration(Stream destination, ExportOptions options = (Exp public class TestRedisServer { - private readonly ConcurrentDictionary>> _subscriptions = - new ConcurrentDictionary>>(); + private readonly ConcurrentDictionary)>> _subscriptions = + new ConcurrentDictionary)>>(); public long Publish(RedisChannel channel, RedisValue message, CommandFlags flags = CommandFlags.None) { if (_subscriptions.TryGetValue(channel, out var handlers)) { - foreach (var handler in handlers) + foreach (var (_, handler) in handlers) { handler(channel, message); } @@ -239,26 +241,37 @@ public long Publish(RedisChannel channel, RedisValue message, CommandFlags flags return handlers != null ? handlers.Count : 0; } - public void Subscribe(RedisChannel channel, Action handler, CommandFlags flags = CommandFlags.None) + public void Subscribe(ChannelMessageQueue messageQueue, int subscriberId, CommandFlags flags = CommandFlags.None) { - _subscriptions.AddOrUpdate(channel, _ => new List> { handler }, (_, list) => + Action handler = (channel, value) => + { + // Workaround for https://github.com/StackExchange/StackExchange.Redis/issues/969 + // ChannelMessageQueue isn't mockable currently, this works around that by using private reflection + typeof(ChannelMessageQueue).GetMethod("Write", BindingFlags.NonPublic | BindingFlags.Instance) + .Invoke(messageQueue, new object[] { channel, value }); + }; + + _subscriptions.AddOrUpdate(messageQueue.Channel, _ => new List<(int, Action)> { (subscriberId, handler) }, (_, list) => { - list.Add(handler); + list.Add((subscriberId, handler)); return list; }); } - public void Unsubscribe(RedisChannel channel, Action handler = null, CommandFlags flags = CommandFlags.None) + public void Unsubscribe(RedisChannel channel, int subscriberId, CommandFlags flags = CommandFlags.None) { if (_subscriptions.TryGetValue(channel, out var list)) { - list.Remove(handler); + list.RemoveAll((item) => item.Item1 == subscriberId); } } } public class TestSubscriber : ISubscriber { + private static int StaticId; + + private readonly int _id; private readonly TestRedisServer _server; public ConnectionMultiplexer Multiplexer => throw new NotImplementedException(); @@ -267,6 +280,7 @@ public class TestSubscriber : ISubscriber public TestSubscriber(TestRedisServer server) { _server = server; + _id = Interlocked.Increment(ref StaticId); } public EndPoint IdentifyEndpoint(RedisChannel channel, CommandFlags flags = CommandFlags.None) @@ -307,7 +321,7 @@ public async Task PublishAsync(RedisChannel channel, RedisValue message, C public void Subscribe(RedisChannel channel, Action handler, CommandFlags flags = CommandFlags.None) { - _server.Subscribe(channel, handler, flags); + throw new NotImplementedException(); } public Task SubscribeAsync(RedisChannel channel, Action handler, CommandFlags flags = CommandFlags.None) @@ -328,7 +342,7 @@ public bool TryWait(Task task) public void Unsubscribe(RedisChannel channel, Action handler = null, CommandFlags flags = CommandFlags.None) { - _server.Unsubscribe(channel, handler, flags); + _server.Unsubscribe(channel, _id, flags); } public void UnsubscribeAll(CommandFlags flags = CommandFlags.None) @@ -364,7 +378,15 @@ public void WaitAll(params Task[] tasks) public ChannelMessageQueue Subscribe(RedisChannel channel, CommandFlags flags = CommandFlags.None) { - throw new NotImplementedException(); + // Workaround for https://github.com/StackExchange/StackExchange.Redis/issues/969 + var redisSubscriberType = typeof(RedisChannel).Assembly.GetType("StackExchange.Redis.RedisSubscriber"); + var ctor = typeof(ChannelMessageQueue).GetConstructor(BindingFlags.Instance | BindingFlags.NonPublic, + binder: null, + new Type[] { typeof(RedisChannel).MakeByRefType(), redisSubscriberType }, modifiers: null); + + var queue = (ChannelMessageQueue)ctor.Invoke(new object[] { channel, null }); + _server.Subscribe(queue, _id); + return queue; } public Task SubscribeAsync(RedisChannel channel, CommandFlags flags = CommandFlags.None) From 302246df4194a779fd526818a09976b7ed739d18 Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Thu, 13 May 2021 09:19:23 -0700 Subject: [PATCH 21/30] Update required version of VS for repo build (#32624) --- docs/BuildFromSource.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/BuildFromSource.md b/docs/BuildFromSource.md index 5b6ff4fcf8b6..22ebed767510 100644 --- a/docs/BuildFromSource.md +++ b/docs/BuildFromSource.md @@ -39,7 +39,7 @@ Building ASP.NET Core on Windows (10, version 1803 or newer) requires that you h #### [Visual Studio 2019](https://visualstudio.com) -Visual Studio 2019 (16.8) is required to build the repo locally. If you don't have visual studio installed you can run [eng/scripts/InstallVisualStudio.ps1](/eng/scripts/InstallVisualStudio.ps1) to install the exact required dependencies. +Visual Studio 2019 (16.10 Preview 3) is required to build the repo locally. If you don't have visual studio installed you can run [eng/scripts/InstallVisualStudio.ps1](/eng/scripts/InstallVisualStudio.ps1) to install the exact required dependencies. > :bulb: By default, the script will install Visual Studio Enterprise Edition, however you can use a different edition by passing the `-Edition` flag. > :bulb: To install Visual Studio from the preview channel, you can use the `-Channel` flag to set the channel (`-Channel Preview`). From 44116a93afa230205823996fc80fab467c5fa96f Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Thu, 13 May 2021 15:19:27 -0700 Subject: [PATCH 22/30] Fix web root for WebApplication (#32604) * Use WebRootKey to populate WebRootPath * Add WebHostEnvironmentTests --- .../samples/SampleApp/Program.cs | 10 +- .../src/ConfigureHostBuilder.cs | 2 +- .../src/Properties/AssemblyInfo.cs | 6 ++ src/DefaultBuilder/src/WebHostEnvironment.cs | 25 ++++- .../WebHostEnvironmentTests.cs | 102 ++++++++++++++++++ 5 files changed, 134 insertions(+), 11 deletions(-) create mode 100644 src/DefaultBuilder/src/Properties/AssemblyInfo.cs create mode 100644 src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebHostEnvironmentTests.cs diff --git a/src/DefaultBuilder/samples/SampleApp/Program.cs b/src/DefaultBuilder/samples/SampleApp/Program.cs index a3d0028efaf1..51a4e81a0ef6 100644 --- a/src/DefaultBuilder/samples/SampleApp/Program.cs +++ b/src/DefaultBuilder/samples/SampleApp/Program.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Threading.Tasks; using Microsoft.AspNetCore; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; @@ -15,13 +14,14 @@ namespace SampleApp { public class Program { - public static async Task Main(string[] args) + public static void Main(string[] args) { - await using var webApp = WebApplication.Create(args); + var app = WebApplication.Create(args); - webApp.MapGet("/", (Func)(() => "Hello, World!")); + app.UseStaticFiles(); + app.MapGet("/", (Func)(() => "Hello, World!")); - await webApp.RunAsync(); + app.Run(); } private static void HelloWorld() diff --git a/src/DefaultBuilder/src/ConfigureHostBuilder.cs b/src/DefaultBuilder/src/ConfigureHostBuilder.cs index 00fae15083e8..73c9b7e03598 100644 --- a/src/DefaultBuilder/src/ConfigureHostBuilder.cs +++ b/src/DefaultBuilder/src/ConfigureHostBuilder.cs @@ -61,7 +61,7 @@ public IHostBuilder ConfigureHostConfiguration(Action con configureDelegate(_hostConfiguration); _environment.ApplyConfigurationSettings(_hostConfiguration.Build()); - Configuration.ChangeBasePath(_environment.ContentRootPath); + Configuration.ChangeFileProvider(_environment.ContentRootFileProvider); _operations += b => b.ConfigureHostConfiguration(configureDelegate); return this; diff --git a/src/DefaultBuilder/src/Properties/AssemblyInfo.cs b/src/DefaultBuilder/src/Properties/AssemblyInfo.cs new file mode 100644 index 000000000000..97ac339e54a9 --- /dev/null +++ b/src/DefaultBuilder/src/Properties/AssemblyInfo.cs @@ -0,0 +1,6 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/DefaultBuilder/src/WebHostEnvironment.cs b/src/DefaultBuilder/src/WebHostEnvironment.cs index 828a59c6f62c..052764c2ea63 100644 --- a/src/DefaultBuilder/src/WebHostEnvironment.cs +++ b/src/DefaultBuilder/src/WebHostEnvironment.cs @@ -38,14 +38,29 @@ public WebHostEnvironment(Assembly? callingAssembly) ResolveFileProviders(new Configuration()); } + // For testing + internal WebHostEnvironment() + { + ApplicationName = default!; + EnvironmentName = default!; + ContentRootPath = default!; + WebRootPath = default!; + ContentRootFileProvider = default!; + WebRootFileProvider = default!; + } + public void ApplyConfigurationSettings(IConfiguration configuration) + { + ReadConfigurationSettings(configuration); + ResolveFileProviders(configuration); + } + + internal void ReadConfigurationSettings(IConfiguration configuration) { ApplicationName = configuration[WebHostDefaults.ApplicationKey] ?? ApplicationName; - ContentRootPath = configuration[WebHostDefaults.ContentRootKey] ?? ContentRootPath; EnvironmentName = configuration[WebHostDefaults.EnvironmentKey] ?? EnvironmentName; - WebRootPath = configuration[WebHostDefaults.ContentRootKey] ?? WebRootPath; - - ResolveFileProviders(configuration); + ContentRootPath = configuration[WebHostDefaults.ContentRootKey] ?? ContentRootPath; + WebRootPath = configuration[WebHostDefaults.WebRootKey] ?? WebRootPath; } public void ApplyEnvironmentSettings(IWebHostBuilder genericWebHostBuilder) @@ -65,7 +80,7 @@ public void ResolveFileProviders(IConfiguration configuration) if (Directory.Exists(WebRootPath)) { - WebRootFileProvider = new PhysicalFileProvider(Path.Combine(ContentRootPath, WebRootPath)); + WebRootFileProvider = new PhysicalFileProvider(WebRootPath); } if (this.IsDevelopment()) diff --git a/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebHostEnvironmentTests.cs b/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebHostEnvironmentTests.cs new file mode 100644 index 000000000000..369a11a61837 --- /dev/null +++ b/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebHostEnvironmentTests.cs @@ -0,0 +1,102 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Xunit; + +namespace Microsoft.AspNetCore.Tests +{ + public class WebHostEnvironmentTests + { + [Fact] + public void ApplyConfigurationSettingsUsesTheCorrectKeys() + { + var configBuilder = new ConfigurationBuilder(); + configBuilder.AddInMemoryCollection(new[] + { + new KeyValuePair(WebHostDefaults.ApplicationKey, WebHostDefaults.ApplicationKey), + new KeyValuePair(WebHostDefaults.EnvironmentKey, WebHostDefaults.EnvironmentKey), + new KeyValuePair(WebHostDefaults.ContentRootKey, WebHostDefaults.ContentRootKey), + new KeyValuePair(WebHostDefaults.WebRootKey, WebHostDefaults.WebRootKey), + }); + + var env = new WebHostEnvironment(); + + // Basically call ApplyConfigurationSettings(config) but without creating PhysicalFileProviders. + env.ReadConfigurationSettings(configBuilder.Build()); + + Assert.Equal(WebHostDefaults.ApplicationKey, env.ApplicationName); + Assert.Equal(WebHostDefaults.EnvironmentKey, env.EnvironmentName); + Assert.Equal(WebHostDefaults.ContentRootKey, env.ContentRootPath); + Assert.Equal(WebHostDefaults.WebRootKey, env.WebRootPath); + } + + [Fact] + public void ApplyEnvironmentSettingsUsesTheCorrectKeys() + { + var env = new WebHostEnvironment + { + ApplicationName = WebHostDefaults.ApplicationKey, + EnvironmentName = WebHostDefaults.EnvironmentKey, + ContentRootPath = WebHostDefaults.ContentRootKey, + WebRootPath = WebHostDefaults.WebRootKey, + }; + + var settings = new Dictionary(); + + env.ApplyEnvironmentSettings(new TestWebHostBuilder(settings)); + + Assert.Equal(WebHostDefaults.ApplicationKey, settings[WebHostDefaults.ApplicationKey]); + Assert.Equal(WebHostDefaults.EnvironmentKey, settings[WebHostDefaults.EnvironmentKey]); + Assert.Equal(WebHostDefaults.ContentRootKey, settings[WebHostDefaults.ContentRootKey]); + Assert.Equal(WebHostDefaults.WebRootKey, settings[WebHostDefaults.WebRootKey]); + } + + private class TestWebHostBuilder : IWebHostBuilder + { + private readonly Dictionary _settings; + + public TestWebHostBuilder(Dictionary settingsDictionary) + { + _settings = settingsDictionary; + } + + public IWebHost Build() + { + throw new NotImplementedException(); + } + + public IWebHostBuilder ConfigureAppConfiguration(Action configureDelegate) + { + throw new NotImplementedException(); + } + + public IWebHostBuilder ConfigureServices(Action configureServices) + { + throw new NotImplementedException(); + } + + public IWebHostBuilder ConfigureServices(Action configureServices) + { + throw new NotImplementedException(); + } + + public string GetSetting(string key) + { + _settings.TryGetValue(key, out var value); + return value; + } + + public IWebHostBuilder UseSetting(string key, string value) + { + _settings[key] = value; + return this; + } + } + } +} From 3ea607158c7e0e3d0c04bc52aa0e7a28b082c17c Mon Sep 17 00:00:00 2001 From: Pranav K Date: Thu, 13 May 2021 15:30:16 -0700 Subject: [PATCH 23/30] Update HotReloadAgent.cs (#32657) --- .../WebAssembly/src/HotReload/HotReloadAgent.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Components/WebAssembly/WebAssembly/src/HotReload/HotReloadAgent.cs b/src/Components/WebAssembly/WebAssembly/src/HotReload/HotReloadAgent.cs index de27c58999c0..aac6cfd916a0 100644 --- a/src/Components/WebAssembly/WebAssembly/src/HotReload/HotReloadAgent.cs +++ b/src/Components/WebAssembly/WebAssembly/src/HotReload/HotReloadAgent.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -// Based on the implementation in https://raw.githubusercontent.com/dotnet/sdk/f67f46eba6d3bcf2b3054381851a975096652454/src/BuiltInTools/DotNetDeltaApplier/HotReloadAgent.cs +// Based on the implementation in https://raw.githubusercontent.com/dotnet/sdk/0304792ef1f53d64182bcfed2ea490e40983a5c5/src/BuiltInTools/DotNetDeltaApplier/HotReloadAgent.cs using System; using System.Collections.Concurrent; @@ -15,7 +15,7 @@ internal sealed class HotReloadAgent : IDisposable { private readonly Action _log; private readonly AssemblyLoadEventHandler _assemblyLoad; - private readonly ConcurrentDictionary> _deltas = new(); + private readonly ConcurrentDictionary> _deltas = new(); private readonly ConcurrentDictionary _appliedAssemblies = new(); private volatile UpdateHandlerActions? _handlerActions; @@ -197,6 +197,10 @@ public void ApplyDeltas(IReadOnlyList deltas) { System.Reflection.Metadata.AssemblyExtensions.ApplyUpdate(assembly, item.MetadataDelta, item.ILDelta, ReadOnlySpan.Empty); } + + // Additionally stash the deltas away so it may be applied to assemblies loaded later. + var cachedDeltas = _deltas.GetOrAdd(item.ModuleId, static _ => new()); + cachedDeltas.Add(item); } handlerActions.ClearCache.ForEach(a => a(updatedTypes)); From ade3d6ebf91c1f295b3df66c298249631e1bcb5e Mon Sep 17 00:00:00 2001 From: ladeak Date: Fri, 14 May 2021 00:48:45 +0200 Subject: [PATCH 24/30] Removing CancelableAsyncEnumerable (#32090) * Convert MakeEnumerable and MakeEnumerableChannel to making IAsyncEnumerator DefaultHubDispatcher iterates using the enumerator --- .../common/Shared/AsyncEnumerableAdapters.cs | 96 +++++++++---------- .../testassets/Tests.Utils/TestClient.cs | 21 +++- .../Core/src/Internal/DefaultHubDispatcher.cs | 11 +-- .../Core/src/Internal/HubMethodDescriptor.cs | 32 +++---- .../HubConnectionHandlerTestUtils/Hubs.cs | 35 ++++++- .../SignalR/test/HubConnectionHandlerTests.cs | 80 ++++++++++++++++ 6 files changed, 197 insertions(+), 78 deletions(-) diff --git a/src/SignalR/common/Shared/AsyncEnumerableAdapters.cs b/src/SignalR/common/Shared/AsyncEnumerableAdapters.cs index 5a641510dd41..a94f23296a07 100644 --- a/src/SignalR/common/Shared/AsyncEnumerableAdapters.cs +++ b/src/SignalR/common/Shared/AsyncEnumerableAdapters.cs @@ -2,8 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; -using System.Diagnostics; -using System.Runtime.CompilerServices; using System.Threading; using System.Threading.Channels; using System.Threading.Tasks; @@ -13,9 +11,10 @@ namespace Microsoft.AspNetCore.SignalR.Internal // True-internal because this is a weird and tricky class to use :) internal static class AsyncEnumerableAdapters { - public static IAsyncEnumerable MakeCancelableAsyncEnumerable(IAsyncEnumerable asyncEnumerable, CancellationToken cancellationToken = default) + public static IAsyncEnumerator MakeCancelableAsyncEnumerator(IAsyncEnumerable asyncEnumerable, CancellationToken cancellationToken = default) { - return new CancelableAsyncEnumerable(asyncEnumerable, cancellationToken); + var enumerator = asyncEnumerable.GetAsyncEnumerator(cancellationToken); + return enumerator as IAsyncEnumerator ?? new BoxedAsyncEnumerator(enumerator); } public static IAsyncEnumerable MakeCancelableTypedAsyncEnumerable(IAsyncEnumerable asyncEnumerable, CancellationTokenSource cts) @@ -23,28 +22,46 @@ public static IAsyncEnumerable MakeCancelableTypedAsyncEnumerable(IAsyncEn return new CancelableTypedAsyncEnumerable(asyncEnumerable, cts); } -#if NETCOREAPP - public static async IAsyncEnumerable MakeAsyncEnumerableFromChannel(ChannelReader channel, [EnumeratorCancellation] CancellationToken cancellationToken = default) + public static IAsyncEnumerator MakeAsyncEnumeratorFromChannel(ChannelReader channel, CancellationToken cancellationToken = default) { - await foreach (var item in channel.ReadAllAsync(cancellationToken)) - { - yield return item; - } + return new ChannelAsyncEnumerator(channel, cancellationToken); } -#else - // System.Threading.Channels.ReadAllAsync() is not available on netstandard2.0 and netstandard2.1 - // But this is the exact same code that it uses - public static async IAsyncEnumerable MakeAsyncEnumerableFromChannel(ChannelReader channel, [EnumeratorCancellation] CancellationToken cancellationToken = default) + + private class ChannelAsyncEnumerator : IAsyncEnumerator { - while (await channel.WaitToReadAsync(cancellationToken).ConfigureAwait(false)) + private readonly ChannelReader _channel; + private readonly CancellationToken _cancellationToken; + public ChannelAsyncEnumerator(ChannelReader channel, CancellationToken cancellationToken) + { + _channel = channel; + _cancellationToken = cancellationToken; + } + + public object? Current { get; private set; } + + public ValueTask MoveNextAsync() { - while (channel.TryRead(out var item)) + if (_channel.TryRead(out var item)) { - yield return item; + Current = item; + return new ValueTask(true); } + + return new ValueTask(MoveNextAsyncAwaited()); } + + private async Task MoveNextAsyncAwaited() + { + if (await _channel.WaitToReadAsync(_cancellationToken).ConfigureAwait(false) && _channel.TryRead(out var item)) + { + Current = item; + return true; + } + return false; + } + + public ValueTask DisposeAsync() => default; } -#endif private class CancelableTypedAsyncEnumerable : IAsyncEnumerable { @@ -99,48 +116,25 @@ public ValueTask DisposeAsync() } } - /// Converts an IAsyncEnumerable of T to an IAsyncEnumerable of object. - private class CancelableAsyncEnumerable : IAsyncEnumerable + private class BoxedAsyncEnumerator : IAsyncEnumerator { - private readonly IAsyncEnumerable _asyncEnumerable; - private readonly CancellationToken _cancellationToken; + private IAsyncEnumerator _asyncEnumerator; - public CancelableAsyncEnumerable(IAsyncEnumerable asyncEnumerable, CancellationToken cancellationToken) + public BoxedAsyncEnumerator(IAsyncEnumerator asyncEnumerator) { - _asyncEnumerable = asyncEnumerable; - _cancellationToken = cancellationToken; + _asyncEnumerator = asyncEnumerator; } - public IAsyncEnumerator GetAsyncEnumerator(CancellationToken cancellationToken = default) - { - // Assume that this will be iterated through with await foreach which always passes a default token. - // Instead use the token from the ctor. - Debug.Assert(cancellationToken == default); + public object? Current => _asyncEnumerator.Current; - var enumeratorOfT = _asyncEnumerable.GetAsyncEnumerator(_cancellationToken); - return enumeratorOfT as IAsyncEnumerator ?? new BoxedAsyncEnumerator(enumeratorOfT); + public ValueTask MoveNextAsync() + { + return _asyncEnumerator.MoveNextAsync(); } - private class BoxedAsyncEnumerator : IAsyncEnumerator + public ValueTask DisposeAsync() { - private IAsyncEnumerator _asyncEnumerator; - - public BoxedAsyncEnumerator(IAsyncEnumerator asyncEnumerator) - { - _asyncEnumerator = asyncEnumerator; - } - - public object? Current => _asyncEnumerator.Current; - - public ValueTask MoveNextAsync() - { - return _asyncEnumerator.MoveNextAsync(); - } - - public ValueTask DisposeAsync() - { - return _asyncEnumerator.DisposeAsync(); - } + return _asyncEnumerator.DisposeAsync(); } } } diff --git a/src/SignalR/common/testassets/Tests.Utils/TestClient.cs b/src/SignalR/common/testassets/Tests.Utils/TestClient.cs index d6ec7f756b32..2f0c2926637d 100644 --- a/src/SignalR/common/testassets/Tests.Utils/TestClient.cs +++ b/src/SignalR/common/testassets/Tests.Utils/TestClient.cs @@ -101,8 +101,21 @@ public Task> StreamAsync(string methodName, params object[] ar public async Task> StreamAsync(string methodName, string[] streamIds, params object[] args) { var invocationId = await SendStreamInvocationAsync(methodName, streamIds, args); + return await ListenAllAsync(invocationId); + } - var messages = new List(); + public async Task> ListenAllAsync(string invocationId) + { + var result = new List(); + await foreach(var item in ListenAsync(invocationId)) + { + result.Add(item); + } + return result; + } + + public async IAsyncEnumerable ListenAsync(string invocationId) + { while (true) { var message = await ReadAsync(); @@ -120,11 +133,11 @@ public async Task> StreamAsync(string methodName, string[] str switch (message) { case StreamItemMessage _: - messages.Add(message); + yield return message; break; case CompletionMessage _: - messages.Add(message); - return messages; + yield return message; + yield break; default: // Message implement ToString so this should be helpful. throw new NotSupportedException($"TestClient recieved an unexpected message: {message}."); diff --git a/src/SignalR/server/Core/src/Internal/DefaultHubDispatcher.cs b/src/SignalR/server/Core/src/Internal/DefaultHubDispatcher.cs index 243b3a5d8622..cfa4dada3b90 100644 --- a/src/SignalR/server/Core/src/Internal/DefaultHubDispatcher.cs +++ b/src/SignalR/server/Core/src/Internal/DefaultHubDispatcher.cs @@ -74,7 +74,7 @@ public DefaultHubDispatcher(IServiceScopeFactory serviceScopeFactory, IHubContex public override async Task OnConnectedAsync(HubConnectionContext connection) { var scope = _serviceScopeFactory.CreateScope(); - connection.HubCallerClients = new HubCallerClients(_hubContext.Clients, connection.ConnectionId); + connection.HubCallerClients = new HubCallerClients(_hubContext.Clients, connection.ConnectionId); try { @@ -470,14 +470,13 @@ private async Task StreamAsync(string invocationId, HubConnectionContext connect return; } - var enumerable = descriptor.FromReturnedStream(result, streamCts.Token); - + await using var enumerator = descriptor.FromReturnedStream(result, streamCts.Token); Log.StreamingResult(_logger, invocationId, descriptor.MethodExecutor); - var streamItemMessage = new StreamItemMessage(invocationId, null); - await foreach (var streamItem in enumerable) + + while (await enumerator.MoveNextAsync()) { - streamItemMessage.Item = streamItem; + streamItemMessage.Item = enumerator.Current; // Send the stream item await connection.WriteAsync(streamItemMessage); } diff --git a/src/SignalR/server/Core/src/Internal/HubMethodDescriptor.cs b/src/SignalR/server/Core/src/Internal/HubMethodDescriptor.cs index 0f34e94b5b7a..82df14b20469 100644 --- a/src/SignalR/server/Core/src/Internal/HubMethodDescriptor.cs +++ b/src/SignalR/server/Core/src/Internal/HubMethodDescriptor.cs @@ -15,16 +15,16 @@ namespace Microsoft.AspNetCore.SignalR.Internal { internal class HubMethodDescriptor { - private static readonly MethodInfo MakeCancelableAsyncEnumerableMethod = typeof(AsyncEnumerableAdapters) + private static readonly MethodInfo MakeCancelableAsyncEnumeratorMethod = typeof(AsyncEnumerableAdapters) .GetRuntimeMethods() - .Single(m => m.Name.Equals(nameof(AsyncEnumerableAdapters.MakeCancelableAsyncEnumerable)) && m.IsGenericMethod); + .Single(m => m.Name.Equals(nameof(AsyncEnumerableAdapters.MakeCancelableAsyncEnumerator)) && m.IsGenericMethod); - private static readonly MethodInfo MakeAsyncEnumerableFromChannelMethod = typeof(AsyncEnumerableAdapters) + private static readonly MethodInfo MakeAsyncEnumeratorFromChannelMethod = typeof(AsyncEnumerableAdapters) .GetRuntimeMethods() - .Single(m => m.Name.Equals(nameof(AsyncEnumerableAdapters.MakeAsyncEnumerableFromChannel)) && m.IsGenericMethod); + .Single(m => m.Name.Equals(nameof(AsyncEnumerableAdapters.MakeAsyncEnumeratorFromChannel)) && m.IsGenericMethod); - private readonly MethodInfo? _makeCancelableEnumerableMethodInfo; - private Func>? _makeCancelableEnumerable; + private readonly MethodInfo? _makeCancelableEnumeratorMethodInfo; + private Func>? _makeCancelableEnumerator; public HubMethodDescriptor(ObjectMethodExecutor methodExecutor, IEnumerable policies) { @@ -46,14 +46,14 @@ public HubMethodDescriptor(ObjectMethodExecutor methodExecutor, IEnumerable)) { StreamReturnType = returnType.GetGenericArguments()[0]; - _makeCancelableEnumerableMethodInfo = MakeCancelableAsyncEnumerableMethod; + _makeCancelableEnumeratorMethodInfo = MakeCancelableAsyncEnumeratorMethod; break; } if (openReturnType == typeof(ChannelReader<>)) { StreamReturnType = returnType.GetGenericArguments()[0]; - _makeCancelableEnumerableMethodInfo = MakeAsyncEnumerableFromChannelMethod; + _makeCancelableEnumeratorMethodInfo = MakeAsyncEnumeratorFromChannelMethod; break; } } @@ -107,22 +107,22 @@ public HubMethodDescriptor(ObjectMethodExecutor methodExecutor, IEnumerable FromReturnedStream(object stream, CancellationToken cancellationToken) + public IAsyncEnumerator FromReturnedStream(object stream, CancellationToken cancellationToken) { // there is the potential for compile to be called times but this has no harmful effect other than perf - if (_makeCancelableEnumerable == null) + if (_makeCancelableEnumerator == null) { - _makeCancelableEnumerable = CompileConvertToEnumerable(_makeCancelableEnumerableMethodInfo!, StreamReturnType!); + _makeCancelableEnumerator = CompileConvertToEnumerator(_makeCancelableEnumeratorMethodInfo!, StreamReturnType!); } - return _makeCancelableEnumerable.Invoke(stream, cancellationToken); + return _makeCancelableEnumerator.Invoke(stream, cancellationToken); } - private static Func> CompileConvertToEnumerable(MethodInfo adapterMethodInfo, Type streamReturnType) + private static Func> CompileConvertToEnumerator(MethodInfo adapterMethodInfo, Type streamReturnType) { // This will call one of two adapter methods to wrap the passed in streamable value into an IAsyncEnumerable: - // - AsyncEnumerableAdapters.MakeCancelableAsyncEnumerable(asyncEnumerable, cancellationToken); - // - AsyncEnumerableAdapters.MakeCancelableAsyncEnumerableFromChannel(channelReader, cancellationToken); + // - AsyncEnumerableAdapters.MakeCancelableAsyncEnumerator(asyncEnumerable, cancellationToken); + // - AsyncEnumerableAdapters.MakeCancelableAsyncEnumeratorFromChannel(channelReader, cancellationToken); var parameters = new[] { @@ -139,7 +139,7 @@ private static Func> Compile }; var methodCall = Expression.Call(null, genericMethodInfo, methodArguments); - var lambda = Expression.Lambda>>(methodCall, parameters); + var lambda = Expression.Lambda>>(methodCall, parameters); return lambda.Compile(); } } diff --git a/src/SignalR/server/SignalR/test/HubConnectionHandlerTestUtils/Hubs.cs b/src/SignalR/server/SignalR/test/HubConnectionHandlerTestUtils/Hubs.cs index 2c7b76a105a9..089e80a37c61 100644 --- a/src/SignalR/server/SignalR/test/HubConnectionHandlerTestUtils/Hubs.cs +++ b/src/SignalR/server/SignalR/test/HubConnectionHandlerTestUtils/Hubs.cs @@ -183,7 +183,7 @@ public Task SendToCaller(string message) public Task ProtocolError() { - return Clients.Caller.SendAsync("Send", new SelfRef()); + return Clients.Caller.SendAsync("Send", new SelfRef()); } public void InvalidArgument(CancellationToken token) @@ -1027,6 +1027,39 @@ public async IAsyncEnumerable CancelableStreamGeneratedAsyncEnumerable([Enu yield break; } + public async IAsyncEnumerable CountingCancelableStreamGeneratedAsyncEnumerable(int count, [EnumeratorCancellation] CancellationToken token) + { + for (int i = 0; i < count; i++) + { + await Task.Yield(); + yield return i; + } + _tcsService.StartedMethod.SetResult(null); + await token.WaitForCancellationAsync(); + _tcsService.EndMethod.SetResult(null); + yield break; + } + + public ChannelReader CountingCancelableStreamGeneratedChannel(int count, CancellationToken token) + { + var channel = Channel.CreateBounded(10); + + Task.Run(async () => + { + for (int i = 0; i < count; i++) + { + await Task.Yield(); + await channel.Writer.WriteAsync(i); + } + _tcsService.StartedMethod.SetResult(null); + await token.WaitForCancellationAsync(); + channel.Writer.TryComplete(); + _tcsService.EndMethod.SetResult(null); + }); + + return channel.Reader; + } + public IAsyncEnumerable CancelableStreamCustomAsyncEnumerable() { return new CustomAsyncEnumerable(_tcsService); diff --git a/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs b/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs index 314da2851a08..31cfe76e801c 100644 --- a/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs +++ b/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs @@ -4147,6 +4147,53 @@ public async Task StreamHubMethodCanBeTriggeredOnCancellation(string methodName, } } + [Theory] + [InlineData(nameof(LongRunningHub.CountingCancelableStreamGeneratedAsyncEnumerable), 2)] + [InlineData(nameof(LongRunningHub.CountingCancelableStreamGeneratedChannel), 2)] + public async Task CancellationAfterGivenMessagesEndsStreaming(string methodName, int count) + { + using (StartVerifiableLog()) + { + var tcsService = new TcsService(); + var serviceProvider = HubConnectionHandlerTestUtils.CreateServiceProvider(builder => + { + builder.AddSingleton(tcsService); + }, LoggerFactory); + var connectionHandler = serviceProvider.GetService>(); + var invocationBinder = new Mock(); + invocationBinder.Setup(b => b.GetStreamItemType(It.IsAny())).Returns(typeof(string)); + + using (var client = new TestClient(invocationBinder: invocationBinder.Object)) + { + var connectionHandlerTask = await client.ConnectAsync(connectionHandler).DefaultTimeout(); + + // Start streaming count number of messages. + var invocationId = await client.SendStreamInvocationAsync(methodName, count).DefaultTimeout(); + + // Listening on incoming messages + var listeningMessages = client.ListenAsync(invocationId); + + // Wait for the number of messages expected to be received. This point the sender just waits forever or until cancellation. + await listeningMessages.ReadAsync(count).DefaultTimeout(); + + // Send cancellation. + await client.SendHubMessageAsync(new CancelInvocationMessage(invocationId)).DefaultTimeout(); + + // Wait for the completion message. + var messages = await listeningMessages.ReadAllAsync().DefaultTimeout(); + Assert.Single(messages); + + // CancellationToken passed to hub method will allow EndMethod to be triggered if it is canceled. + await tcsService.EndMethod.Task.DefaultTimeout(); + + // Shut down + client.Dispose(); + + await connectionHandlerTask.DefaultTimeout(); + } + } + } + [Fact] public async Task StreamHubMethodCanAcceptCancellationTokenAsArgumentAndBeTriggeredOnConnectionAborted() { @@ -4522,4 +4569,37 @@ private class HttpContextFeatureImpl : IHttpContextFeature public HttpContext HttpContext { get; set; } } } + + public static class IAsyncEnumerableExtension + { + public static async Task> ReadAsync(this IAsyncEnumerable enumerable, int count) + { + if (count <= 0) + { + throw new ArgumentException("Input must be greater than zero.", nameof(count)); + } + + var result = new List(); + await foreach (var item in enumerable) + { + result.Add(item); + if (result.Count == count) + { + break; + } + } + return result; + } + + public static async Task> ReadAllAsync(this IAsyncEnumerable enumerable) + { + var result = new List(); + await foreach (var item in enumerable) + { + result.Add(item); + } + + return result; + } + } } From 537ed0f24de2a5ae2f8fe7a7a762a1985b793002 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 13 May 2021 23:07:06 +0000 Subject: [PATCH 25/30] Update dependencies from https://github.com/dotnet/runtime build 20210513.1 (#32642) [main] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 240 ++++++++++++++++++++-------------------- eng/Versions.props | 120 ++++++++++---------- 2 files changed, 180 insertions(+), 180 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 877bd78a4dcf..43e116989f9b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,241 +41,241 @@ https://github.com/dotnet/efcore 7249f629c2c992c0173994032ebc5af5f9b5d542 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 https://github.com/dotnet/emsdk @@ -289,16 +289,16 @@ https://github.com/dotnet/emsdk 411d8383281e4f9f2983b832593e85f9e6e7bbc6 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 - + https://github.com/dotnet/runtime - b4f4418d56d32c3a1677b5651899a112d7e02226 + 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index b25ac9cbb716..2716a483caee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,70 +65,70 @@ --> - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 6.0.0-preview.5.21262.1 6.0.0-preview.5.21262.1 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21262.1 + 6.0.0-preview.5.21263.1 6.0.0-preview.5.21260.5 6.0.0-preview.5.21260.5 From f4cf30268d8233d3773203eecb94b085b95dc69c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 May 2021 00:49:06 +0000 Subject: [PATCH 26/30] Update dependencies from https://github.com/dotnet/efcore build 20210513.1 (#32661) [main] Update dependencies from dotnet/efcore --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 43e116989f9b..eeb07aedcc5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - + https://github.com/dotnet/efcore - 7249f629c2c992c0173994032ebc5af5f9b5d542 + 14da5d9186776ef4e205c3cd0e7ea450c3117456 - + https://github.com/dotnet/efcore - 7249f629c2c992c0173994032ebc5af5f9b5d542 + 14da5d9186776ef4e205c3cd0e7ea450c3117456 - + https://github.com/dotnet/efcore - 7249f629c2c992c0173994032ebc5af5f9b5d542 + 14da5d9186776ef4e205c3cd0e7ea450c3117456 - + https://github.com/dotnet/efcore - 7249f629c2c992c0173994032ebc5af5f9b5d542 + 14da5d9186776ef4e205c3cd0e7ea450c3117456 - + https://github.com/dotnet/efcore - 7249f629c2c992c0173994032ebc5af5f9b5d542 + 14da5d9186776ef4e205c3cd0e7ea450c3117456 - + https://github.com/dotnet/efcore - 7249f629c2c992c0173994032ebc5af5f9b5d542 + 14da5d9186776ef4e205c3cd0e7ea450c3117456 - + https://github.com/dotnet/efcore - 7249f629c2c992c0173994032ebc5af5f9b5d542 + 14da5d9186776ef4e205c3cd0e7ea450c3117456 - + https://github.com/dotnet/efcore - 7249f629c2c992c0173994032ebc5af5f9b5d542 + 14da5d9186776ef4e205c3cd0e7ea450c3117456 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2716a483caee..6d69f1d509fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -130,14 +130,14 @@ 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21260.5 - 6.0.0-preview.5.21260.5 - 6.0.0-preview.5.21260.5 - 6.0.0-preview.5.21260.5 - 6.0.0-preview.5.21260.5 - 6.0.0-preview.5.21260.5 - 6.0.0-preview.5.21260.5 - 6.0.0-preview.5.21260.5 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.1 6.0.0-beta.21261.2 From 29e37521b7f1d4d1eb3c48b8942707b4809a41f6 Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Thu, 13 May 2021 21:43:20 -0700 Subject: [PATCH 27/30] Update yarn.lock files (#32654) --- src/Components/Web.JS/yarn.lock | 2 +- src/SignalR/clients/ts/FunctionalTests/yarn.lock | 2 +- src/SignalR/clients/ts/signalr-protocol-msgpack/yarn.lock | 2 +- src/SignalR/clients/ts/signalr/yarn.lock | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Components/Web.JS/yarn.lock b/src/Components/Web.JS/yarn.lock index f32fb0b8e7b1..bbae6e0f2634 100644 --- a/src/Components/Web.JS/yarn.lock +++ b/src/Components/Web.JS/yarn.lock @@ -5609,7 +5609,7 @@ write-file-atomic@^3.0.0: signal-exit "^3.0.2" typedarray-to-buffer "^3.1.5" -ws@^7.4.3, ws@^7.4.4: +ws@^7.4.4, ws@^7.4.5: version "7.4.5" resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1" integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g== diff --git a/src/SignalR/clients/ts/FunctionalTests/yarn.lock b/src/SignalR/clients/ts/FunctionalTests/yarn.lock index 16013c3b548f..e45e99a26398 100644 --- a/src/SignalR/clients/ts/FunctionalTests/yarn.lock +++ b/src/SignalR/clients/ts/FunctionalTests/yarn.lock @@ -2274,7 +2274,7 @@ wrappy@1: dependencies: async-limiter "~1.0.0" -ws@^7.4.3: +ws@^7.4.5: version "7.4.5" resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1" integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g== diff --git a/src/SignalR/clients/ts/signalr-protocol-msgpack/yarn.lock b/src/SignalR/clients/ts/signalr-protocol-msgpack/yarn.lock index d6e1ada34c6e..1817eaf14fbf 100644 --- a/src/SignalR/clients/ts/signalr-protocol-msgpack/yarn.lock +++ b/src/SignalR/clients/ts/signalr-protocol-msgpack/yarn.lock @@ -91,7 +91,7 @@ url-parse@^1.4.3: querystringify "^2.1.1" requires-port "^1.0.0" -ws@^7.4.3: +ws@^7.4.5: version "7.4.5" resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1" integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g== diff --git a/src/SignalR/clients/ts/signalr/yarn.lock b/src/SignalR/clients/ts/signalr/yarn.lock index 40f7f28a367c..455ea3a5a411 100644 --- a/src/SignalR/clients/ts/signalr/yarn.lock +++ b/src/SignalR/clients/ts/signalr/yarn.lock @@ -236,7 +236,7 @@ url-parse@^1.4.3: querystringify "^2.1.1" requires-port "^1.0.0" -ws@7.4.5: +ws@^7.4.5: version "7.4.5" resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1" integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g== From c53700bf8a265303f90e0b1f73be4f27c756f6b7 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Thu, 13 May 2021 23:21:48 -0700 Subject: [PATCH 28/30] Clean up `$(RepoRoot)` consistently (#32664) - don't override correct values but fix incorrect ones - fix #32615 - also get SignalR pipeline working again nits: - don't use `$(MSBuildProjectDirectory)` in project files - inconsistent w/ `$(MSBuildThisFileDirectory)` and harder to grok - don't add unnecessary slashes after `$(MSBuildThisFileDirectory)` - clean up Microsoft.AspNetCore.Testing.props - used only from eng/targets/CSharp.Common.props but fallback settings may help --- Directory.Build.props | 2 +- eng/CodeGen.proj | 3 ++- eng/tools/GenerateFiles/GenerateFiles.csproj | 4 ++-- .../Microsoft.AspNetCore.Components.E2ETests.csproj | 8 ++++---- .../SignalR.Npm.FunctionalTests.npmproj | 10 +++++----- src/SiteExtensions/Sdk/SiteExtension.targets | 2 +- .../src/build/Microsoft.AspNetCore.Testing.props | 10 +++++++--- .../Microsoft.Extensions.ApiDescription.Client.props | 2 +- ...osoft.Extensions.ApiDescription.Client.Tests.csproj | 4 ++-- .../Microsoft.Extensions.ApiDescription.Server.targets | 2 +- 10 files changed, 26 insertions(+), 21 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index ad7ced95c93e..b6d0b7b7b775 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -3,7 +3,7 @@ - $([MSBuild]::EnsureTrailingSlash('$(MSBuildThisFileDirectory)')) + $(MSBuildThisFileDirectory) https://github.com/dotnet/aspnetcore git diff --git a/eng/CodeGen.proj b/eng/CodeGen.proj index 5ddd599daf03..799c20e07c08 100644 --- a/eng/CodeGen.proj +++ b/eng/CodeGen.proj @@ -2,7 +2,8 @@ true - $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', '..')) + $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', '..')) true diff --git a/eng/tools/GenerateFiles/GenerateFiles.csproj b/eng/tools/GenerateFiles/GenerateFiles.csproj index f569e0913641..c633f6256aaf 100644 --- a/eng/tools/GenerateFiles/GenerateFiles.csproj +++ b/eng/tools/GenerateFiles/GenerateFiles.csproj @@ -22,12 +22,12 @@ - - diff --git a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj index 0b1af77eda8a..52d5166441b5 100644 --- a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj +++ b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj @@ -49,25 +49,25 @@ diff --git a/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj b/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj index 46792aa2fee3..6eb64f9feb09 100644 --- a/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj +++ b/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj @@ -31,7 +31,7 @@ + WorkingDirectory="$(MSBuildThisFileDirectory)" /> sauce.local @@ -41,7 +41,7 @@ + WorkingDirectory="$(MSBuildThisFileDirectory)" /> @@ -49,15 +49,15 @@ - + - - + + diff --git a/src/SiteExtensions/Sdk/SiteExtension.targets b/src/SiteExtensions/Sdk/SiteExtension.targets index 943385b70041..2fa12f51e2a5 100644 --- a/src/SiteExtensions/Sdk/SiteExtension.targets +++ b/src/SiteExtensions/Sdk/SiteExtension.targets @@ -41,7 +41,7 @@ - <_TemplateFiles Include="$(MSBuildThisFileDirectory)\HostingStartup\*.cs*" /> + <_TemplateFiles Include="$(MSBuildThisFileDirectory)HostingStartup\*.cs*" /> - $(RepositoryRoot) - $(ASPNETCORE_TEST_LOG_DIR) - $(RepoRoot)artifacts\log\ + $(ASPNETCORE_TEST_LOG_DIR) + $(RepoRoot)artifacts\log\ - <_ApiDescriptionClientAssemblyPath>$(MSBuildThisFileDirectory)/../tasks/netstandard2.0/Microsoft.Extensions.ApiDescription.Client.dll + <_ApiDescriptionClientAssemblyPath>$(MSBuildThisFileDirectory)../tasks/netstandard2.0/Microsoft.Extensions.ApiDescription.Client.dll diff --git a/src/Tools/Extensions.ApiDescription.Client/test/Microsoft.Extensions.ApiDescription.Client.Tests.csproj b/src/Tools/Extensions.ApiDescription.Client/test/Microsoft.Extensions.ApiDescription.Client.Tests.csproj index e642e7ce036b..db09c31bee67 100644 --- a/src/Tools/Extensions.ApiDescription.Client/test/Microsoft.Extensions.ApiDescription.Client.Tests.csproj +++ b/src/Tools/Extensions.ApiDescription.Client/test/Microsoft.Extensions.ApiDescription.Client.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/Tools/Extensions.ApiDescription.Server/src/build/Microsoft.Extensions.ApiDescription.Server.targets b/src/Tools/Extensions.ApiDescription.Server/src/build/Microsoft.Extensions.ApiDescription.Server.targets index 3b9bc09c38e9..d01604fb59e2 100644 --- a/src/Tools/Extensions.ApiDescription.Server/src/build/Microsoft.Extensions.ApiDescription.Server.targets +++ b/src/Tools/Extensions.ApiDescription.Server/src/build/Microsoft.Extensions.ApiDescription.Server.targets @@ -51,7 +51,7 @@ Text="OpenAPI document generation is not supported when targeting netcoreapp2.0 or earlier. Disable the feature or move to a later target framework." /> - <_Command>dotnet "$(MSBuildThisFileDirectory)/../tools/dotnet-getdocument.dll" --assembly "$(TargetPath)" + <_Command>dotnet "$(MSBuildThisFileDirectory)../tools/dotnet-getdocument.dll" --assembly "$(TargetPath)" <_Command>$(_Command) --file-list "$(_OpenApiDocumentsCache)" --framework "$(TargetFrameworkMoniker)" <_Command>$(_Command) --output "$(OpenApiDocumentsDirectory.TrimEnd('\'))" --project "$(MSBuildProjectName)" <_Command Condition=" '$(ProjectAssetsFile)' != '' ">$(_Command) --assets-file "$(ProjectAssetsFile)" From 90b9d805abbba0626c7ea156445a5640dc4c7bb6 Mon Sep 17 00:00:00 2001 From: Shreyas Jejurkar Date: Fri, 14 May 2021 12:54:28 +0530 Subject: [PATCH 29/30] Updated build.sh (#32665) Corrected explanation of option parameter. --- eng/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/build.sh b/eng/build.sh index 458f2ae643ac..4466bcce1128 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -72,7 +72,7 @@ Options: --[no-]build-managed Build managed projects (C#, F#, VB). --[no-]build-nodejs Build NodeJS projects (TypeScript, JS). --[no-]build-java Build Java projects. - --[no-]build-installers Build Java projects. + --[no-]build-installers Build installers. --ci Apply CI specific settings and environment variables. --binarylog|-bl Use a binary logger From b58a5288ebeded0c7b3335d05c6afa773def377b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 May 2021 13:46:56 +0000 Subject: [PATCH 30/30] [main] Update dependencies from dotnet/efcore dotnet/runtime (#32663) [main] Update dependencies from dotnet/efcore dotnet/runtime --- eng/Version.Details.xml | 272 ++++++++++++++++++++-------------------- eng/Versions.props | 136 ++++++++++---------- 2 files changed, 204 insertions(+), 204 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eeb07aedcc5d..4b957fe3f032 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,273 +9,273 @@ --> - + https://github.com/dotnet/efcore - 14da5d9186776ef4e205c3cd0e7ea450c3117456 + d277e0c57a8bf22c1efacab755bddb5834abc177 - + https://github.com/dotnet/efcore - 14da5d9186776ef4e205c3cd0e7ea450c3117456 + d277e0c57a8bf22c1efacab755bddb5834abc177 - + https://github.com/dotnet/efcore - 14da5d9186776ef4e205c3cd0e7ea450c3117456 + d277e0c57a8bf22c1efacab755bddb5834abc177 - + https://github.com/dotnet/efcore - 14da5d9186776ef4e205c3cd0e7ea450c3117456 + d277e0c57a8bf22c1efacab755bddb5834abc177 - + https://github.com/dotnet/efcore - 14da5d9186776ef4e205c3cd0e7ea450c3117456 + d277e0c57a8bf22c1efacab755bddb5834abc177 - + https://github.com/dotnet/efcore - 14da5d9186776ef4e205c3cd0e7ea450c3117456 + d277e0c57a8bf22c1efacab755bddb5834abc177 - + https://github.com/dotnet/efcore - 14da5d9186776ef4e205c3cd0e7ea450c3117456 + d277e0c57a8bf22c1efacab755bddb5834abc177 - + https://github.com/dotnet/efcore - 14da5d9186776ef4e205c3cd0e7ea450c3117456 + d277e0c57a8bf22c1efacab755bddb5834abc177 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 https://github.com/dotnet/emsdk @@ -289,16 +289,16 @@ https://github.com/dotnet/emsdk 411d8383281e4f9f2983b832593e85f9e6e7bbc6 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/runtime - 1b09a384f29eafd98ec6bcb2d9e6fc820c9db801 + 65bdceb4d47075964bb9d3878c994d020d594068 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 6d69f1d509fe..5690f8ed1653 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,79 +65,79 @@ --> - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 6.0.0-preview.5.21262.1 6.0.0-preview.5.21262.1 6.0.0-preview.5.21262.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21263.11 - 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.11 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 - 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21263.2 + 6.0.0-preview.5.21263.2 + 6.0.0-preview.5.21263.2 + 6.0.0-preview.5.21263.2 + 6.0.0-preview.5.21263.2 + 6.0.0-preview.5.21263.2 + 6.0.0-preview.5.21263.2 + 6.0.0-preview.5.21263.2 6.0.0-beta.21261.2