diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json index 3766c15bc9..4ef7827283 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json @@ -531,6 +531,8 @@ "MaxColorCountWarning": "You can add up to {0} colors", "MinColorCountWarning": "You must add at least {0} colors", "RaffleDeletionConfirmationMessage": "Are you sure you want to delete this raffle?", - "CreateRaffle": "Create Raffle" + "CreateRaffle": "Create Raffle", + "RemoveImage": "Remove Image", + "SuccessfullySaved": "Successfully saved" } } diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json index f5a637676e..18ff9ab989 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json @@ -205,7 +205,7 @@ "hrs": "hrs", "min": "min", "sec": "sec", - "Winners:": "Winners:", + "Winners": "Winners", "To{0}LuckyWinners": "to {0} lucky winner(s)", "ActiveRaffles": "Active Raffles", "UpcomingRaffles": "Upcoming Raffles", @@ -215,10 +215,14 @@ "RaffleSubscriptionCodeInputMessage": "This raffle requires a registration code. Please enter the registration code below:", "RaffleSubscriptionCodeInputErrorMessage": "The registration code is incorrect. Please try again.", "GoodJob!": "Good Job!", - "RaffleJoinSuccessMessage": "You are successfully registered tor the raffle. You will be informed via email if you win the prize!", + "RaffleJoinSuccessMessage": "You are successfully registered for the raffle. You will be informed via email if you win the prize!", "RaffleLoginAndRegisterMessage": "You should sign in to join a raffle. You can create an account for free if you haven't registered yet.", "Ok": "Ok", "SeeDetails": "See Details", - "WaitingForDraw": "Waiting for draw" + "WaitingForTheDraw": "Waiting for the draw", + "AllAttendees": "All Attendees", + "SeeRaffleDetail": "See Raffle Detail", + "SeeRaffle": "See Raffle", + "ParticipationIsComplete!": "Participation is complete!" } } diff --git a/docs/en/Blog-Posts/2023-09-23-CMS-Kit-Demo/POST.md b/docs/en/Blog-Posts/2023-09-23-CMS-Kit-Demo/POST.md new file mode 100644 index 0000000000..604d4c5c6c --- /dev/null +++ b/docs/en/Blog-Posts/2023-09-23-CMS-Kit-Demo/POST.md @@ -0,0 +1,98 @@ +# Unleash the Power of ABP CMS Kit: A Dynamic Content Showcase + +We're excited to introduce to you [ABP](https://abp.io/)'s [CMS Kit Module](https://docs.abp.io/en/abp/latest/Modules/Cms-Kit/Index) – a versatile module that empowers you to build your own dynamic content website with ease. In this introductory blog post, we'll first take a look at the **CMS Kit Module** and then we'll take you on a journey through our **CMS Kit Demo Application**, showcasing the incredible capabilities of this feature-rich module. + +## Overview of the CMS Kit Module + +At the heart of ABP's CMS Kit Module is a robust Content Management System (CMS) designed to simplify content creation and management. With the CMS Kit, you have the tools to build your own dynamic content website, complete with a range of features tailored to your specific needs. It provides core **building blocks** and fully working sub-systems to create your own website with the CMS features or use the building blocks in your websites for any purpose. + +### CMS Kit: The Building Blocks (a.k.a Features) + +The following features are currently available and ready to use: + +* **Blogging**: Create your blog and publish posts (with markdown / HTML support) +* **Dynamic Pages**: Create pages with dynamic URLs (with markdown / HTML support) +* **Dynamic Menu**: Manage your application’s main menu on the fly +* **Tagging**: Tag any kind of content, like a blog post +* **Comments**: Allow users to comment and discuss in your application +* **Reactions**: Allow users to react to your content using simple smileys +* **Rating**: Reusable component to rate other contents +* **Global Resources**: Dynamically add CSS / JavaScript to your pages or blog posts +* **Dynamic Widgets**: Build widgets and use them in dynamic content, like blog posts + +> For more information, please check the [CMS Kit Module documentation](https://docs.abp.io/en/abp/latest/Modules/Cms-Kit/Index). In the documentation, you can see descriptions for each feature, learn how to install & configure the module, and much more... + +### CMS Kit Pro: The Building Blocks (a.k.a Features) + +CMS Kit Pro is a part of [ABP Commercial](https://commercial.abp.io/) and provides additional features. The following features are provided by the CMS Kit Pro Module: + +* **Contact Form**: Easily add a «contact us» form to your website +* **Newsletter**: Allow users to subscribe to your newsletter (with multiple categories) +* **URL Forwarding**: Create short URLs or redirect users to other pages (for example: [abp.io/dapr](https://abp.io/dapr)) +* **Poll**: Create quick polls for your users +* **Page Feedback**: Collect feedbacks from users for your content + +> For more information, check the [CMS Kit Pro Module documentation](https://docs.abp.io/en/commercial/latest/modules/cms-kit/index). + +## Explore the CMS Kit Demo Application + +As the core ABP development team, we've created a sample application to showcase the incredible capabilities of the ABP's CMS Kit Module. You can explore the source code of the application on our [GitHub repository](https://github.com/abpframework/cms-kit-demo) to get a deeper understanding of how the CMS Kit works under the hood. While developing the application, we aimed to build a real-world application and use almost all of the CMS Kit Features. + +In the next sections, we will provide a detailed walkthrough of the application and highlight each CMS Kit feature that has been incorporated into it. + +### Dynamic Menu Creation with CMS Kit's Menu System + +One of the standing out features of the CMS Kit is its [Menu System](https://docs.abp.io/en/abp/latest/Modules/Cms-Kit/Menus), which allows for the creation and dynamic ordering of application menu items. Say goodbye to static menus; with CMS Kit, you have the power to tailor your menu structure according to your evolving content needs. + +You can see the homepage of the application in the following figure: + +![](homepage.png) + +The application menu items in the navbar are **created & ordered dynamically** with the [CMS Kit's Menu System](https://docs.abp.io/en/abp/latest/Modules/Cms-Kit/Menus): + +![](menu-admin-side.jpg) + +### Custom Implementations with Comment & Reaction Features + +Our demo application goes a step further by demonstrating custom implementations, such as an **image gallery**, seamlessly integrated with CMS Kit's [Comment](https://docs.abp.io/en/abp/latest/Modules/Cms-Kit/Comments) & [Reaction](https://docs.abp.io/en/abp/latest/Modules/Cms-Kit/Reactions) Features: + +| Gallery | Detail Page | +|------------------------ |-----------------------| +| ![](image-gallery.jpg) | ![](image-gallery-detail.jpg) | + +It's pretty easy to integrate CMS Kit Features such as Comments & Reactions into your existing pages. You can check the [source code of the application](https://github.com/abpframework/cms-kit-demo/blob/main/src/CmsKitDemo/Pages/Gallery/Detail.cshtml) and see how to integrate the features. + +### Robust Blogging Capabilities + +Blogging has never been easier! With the CMS Kit's [Blogging Feature](https://docs.abp.io/en/abp/latest/Modules/Cms-Kit/Blogging), you can effortlessly manage your blog content, complete with [Ratings](https://docs.abp.io/en/abp/latest/Modules/Cms-Kit/Ratings), [Comments](https://docs.abp.io/en/abp/latest/Modules/Cms-Kit/Comments), [Tags](https://docs.abp.io/en/abp/latest/Modules/Cms-Kit/Tags), and [Reactions](https://docs.abp.io/en/abp/latest/Modules/Cms-Kit/Reactions) features as enabled: + +| Blog | Blog Post | +|------------------------ |-----------------------| +| ![](blogs.jpg) | ![](blog-detail.jpg) | + +You can enable/disable CMS Kit Features per blog on the admin side easily: + +![](cmskit-module-features.png) + +### Dynamic Pages with Style and Script Integration + +*Products* pages showcase the flexibility of the CMS Kit's [Pages Feature](https://docs.abp.io/en/abp/latest/Modules/Cms-Kit/Pages), allowing for dynamic content creation, style customization, and script integration. Your website can now truly reflect your unique brand and content style. + +You can create pages with dynamic URLs on the admin side: + +![](pages-admin-side.jpg) + +After you have created the page, you can access it via `/{slug}` URL on the public-web side: + +![](products-abp-commercial.png) + +## What's Next? + +Please try the CMS Kit Module now and provide [feedback](https://github.com/abpframework/abp) to help us to build a more effective content management kit! + +## Resources + +* [CMS Kit Demo: Source Code](https://github.com/abpframework/cms-kit-demo) +* [cms-kit-demo.abp.io](https://cms-kit-demo.abp.io/) +* [CMS Kit Module documentation](https://docs.abp.io/en/abp/latest/Modules/Cms-Kit/Index) +* [CMS Kit Pro Module documentation](https://docs.abp.io/en/commercial/latest/modules/cms-kit/index) \ No newline at end of file diff --git a/docs/en/Blog-Posts/2023-09-23-CMS-Kit-Demo/blog-detail.jpg b/docs/en/Blog-Posts/2023-09-23-CMS-Kit-Demo/blog-detail.jpg new file mode 100644 index 0000000000..d1e2a06f94 Binary files /dev/null and b/docs/en/Blog-Posts/2023-09-23-CMS-Kit-Demo/blog-detail.jpg differ diff --git a/docs/en/Blog-Posts/2023-09-23-CMS-Kit-Demo/blogs.jpg b/docs/en/Blog-Posts/2023-09-23-CMS-Kit-Demo/blogs.jpg new file mode 100644 index 0000000000..70d276349c Binary files /dev/null and b/docs/en/Blog-Posts/2023-09-23-CMS-Kit-Demo/blogs.jpg differ diff --git a/docs/en/Blog-Posts/2023-09-23-CMS-Kit-Demo/cmskit-module-features.png b/docs/en/Blog-Posts/2023-09-23-CMS-Kit-Demo/cmskit-module-features.png new file mode 100644 index 0000000000..b6dd409e0a Binary files /dev/null and b/docs/en/Blog-Posts/2023-09-23-CMS-Kit-Demo/cmskit-module-features.png differ diff --git a/docs/en/Blog-Posts/2023-09-23-CMS-Kit-Demo/homepage.png b/docs/en/Blog-Posts/2023-09-23-CMS-Kit-Demo/homepage.png new file mode 100644 index 0000000000..3c485415aa Binary files /dev/null and b/docs/en/Blog-Posts/2023-09-23-CMS-Kit-Demo/homepage.png differ diff --git a/docs/en/Blog-Posts/2023-09-23-CMS-Kit-Demo/image-gallery-detail.jpg b/docs/en/Blog-Posts/2023-09-23-CMS-Kit-Demo/image-gallery-detail.jpg new file mode 100644 index 0000000000..70ea35ea2d Binary files /dev/null and b/docs/en/Blog-Posts/2023-09-23-CMS-Kit-Demo/image-gallery-detail.jpg differ diff --git a/docs/en/Blog-Posts/2023-09-23-CMS-Kit-Demo/image-gallery.jpg b/docs/en/Blog-Posts/2023-09-23-CMS-Kit-Demo/image-gallery.jpg new file mode 100644 index 0000000000..b8b6291342 Binary files /dev/null and b/docs/en/Blog-Posts/2023-09-23-CMS-Kit-Demo/image-gallery.jpg differ diff --git a/docs/en/Blog-Posts/2023-09-23-CMS-Kit-Demo/menu-admin-side.jpg b/docs/en/Blog-Posts/2023-09-23-CMS-Kit-Demo/menu-admin-side.jpg new file mode 100644 index 0000000000..c4dd12275e Binary files /dev/null and b/docs/en/Blog-Posts/2023-09-23-CMS-Kit-Demo/menu-admin-side.jpg differ diff --git a/docs/en/Blog-Posts/2023-09-23-CMS-Kit-Demo/pages-admin-side.jpg b/docs/en/Blog-Posts/2023-09-23-CMS-Kit-Demo/pages-admin-side.jpg new file mode 100644 index 0000000000..27ba597e13 Binary files /dev/null and b/docs/en/Blog-Posts/2023-09-23-CMS-Kit-Demo/pages-admin-side.jpg differ diff --git a/docs/en/Blog-Posts/2023-09-23-CMS-Kit-Demo/products-abp-commercial.png b/docs/en/Blog-Posts/2023-09-23-CMS-Kit-Demo/products-abp-commercial.png new file mode 100644 index 0000000000..0401a947f5 Binary files /dev/null and b/docs/en/Blog-Posts/2023-09-23-CMS-Kit-Demo/products-abp-commercial.png differ diff --git a/docs/en/Dependency-Injection.md b/docs/en/Dependency-Injection.md index 206c2c58a4..d8afe5c21c 100644 --- a/docs/en/Dependency-Injection.md +++ b/docs/en/Dependency-Injection.md @@ -1,12 +1,12 @@ # Dependency Injection -ABP's Dependency Injection system is developed based on Microsoft's [dependency injection extension](https://medium.com/volosoft/asp-net-core-dependency-injection-best-practices-tips-tricks-c6e9c67f9d96) library (Microsoft.Extensions.DependencyInjection nuget package). So, it's documentation is valid in ABP too. +ABP's Dependency Injection system is developed based on Microsoft's [dependency injection extension](https://medium.com/volosoft/asp-net-core-dependency-injection-best-practices-tips-tricks-c6e9c67f9d96) library (Microsoft.Extensions.DependencyInjection nuget package). So, its documentation is valid in ABP too. > While ABP has no core dependency to any 3rd-party DI provider. However, it's required to use a provider that supports dynamic proxying and some other advanced features to make some ABP features properly work. Startup templates come with [Autofac](https://autofac.org/) installed. See [Autofac integration](Autofac-Integration.md) document for more information. ## Modularity -Since ABP is a modular framework, every module defines it's own services and registers via dependency injection in it's own separate [module class](Module-Development-Basics.md). Example: +Since ABP is a modular framework, every module defines its own services and registers via dependency injection in its own separate [module class](Module-Development-Basics.md). Example: ````C# public class BlogModule : AbpModule @@ -210,7 +210,7 @@ public class TaxAppService : ApplicationService } ```` -``TaxAppService`` gets ``ITaxCalculator`` in it's constructor. The dependency injection system automatically provides the requested service at runtime. +``TaxAppService`` gets ``ITaxCalculator`` in its constructor. The dependency injection system automatically provides the requested service at runtime. Constructor injection is preffered way of injecting dependencies to a class. In that way, the class can not be constructed unless all constructor-injected dependencies are provided. Thus, the class explicitly declares it's required services. diff --git a/docs/en/Deployment/Configuring-OpenIddict.md b/docs/en/Deployment/Configuring-OpenIddict.md index bf7bc9c619..b044bcb275 100644 --- a/docs/en/Deployment/Configuring-OpenIddict.md +++ b/docs/en/Deployment/Configuring-OpenIddict.md @@ -2,61 +2,46 @@ This document introduces how to configure `OpenIddict` in the `AuthServer` project. -There are different configurations in the `AuthServer` project for `Development` and `Production` environment. +There are different configurations in the `AuthServer` project for the `Development` and `Production` environments. ````csharp public override void PreConfigureServices(ServiceConfigurationContext context) { var hostingEnvironment = context.Services.GetHostingEnvironment(); - // Development environment - if (hostingEnvironment.IsDevelopment()) - { - PreConfigure(options => - { - // This is default value, you can remove this line. - options.AddDevelopmentEncryptionAndSigningCertificate = true; - }); - } - - // Production or Staging environment if (!hostingEnvironment.IsDevelopment()) { - PreConfigure(options => - { - options.AddDevelopmentEncryptionAndSigningCertificate = false; - }); - - PreConfigure(builder => - { - builder.AddSigningCertificate(GetSigningCertificate(hostingEnvironment)); - builder.AddEncryptionCertificate(GetSigningCertificate(hostingEnvironment)); - - //... - }); + PreConfigure(options => + { + options.AddDevelopmentEncryptionAndSigningCertificate = false; + }); + + PreConfigure(serverBuilder => + { + serverBuilder.AddProductionEncryptionAndSigningCertificate("openiddict.pfx", "00000000-0000-0000-0000-000000000000"); + }); } } - -private X509Certificate2 GetSigningCertificate(IWebHostEnvironment hostingEnv) -{ - return new X509Certificate2(Path.Combine(hostingEnv.ContentRootPath, "authserver.pfx"), "00000000-0000-0000-0000-000000000000"); -} ```` ## Development Environment -We've enabled `AddDevelopmentEncryptionAndSigningCertificate` by default on development environment, It registers (and generates if necessary) a user-specific development encryption/development signing certificate. This is a certificate used for signing and encrypting the tokens and for **development environment only**. +We've enabled `AddDevelopmentEncryptionAndSigningCertificate` by default on the development environment. It registers (and generates if necessary) a user-specific development encryption/development signing certificate. This is a certificate used for signing and encrypting the tokens and for **development environment only**. `AddDevelopmentEncryptionAndSigningCertificate` cannot be used in applications deployed on IIS or Azure App Service: trying to use them on IIS or Azure App Service will result in an exception being thrown at runtime (unless the application pool is configured to [load a user profile](https://learn.microsoft.com/en-us/iis/manage/configuring-security/application-pool-identities#user-profile)). -To avoid that, consider creating self-signed certificates and storing them in the X.509 certificates storage of the host machine(s). This is the way we do it in production environment. +To avoid that, consider creating self-signed certificates and storing them in the X.509 certificates storage of the host machine(s). This is the way we do it in the production environment. ## Production Environment -We've disabled `AddDevelopmentEncryptionAndSigningCertificate` in production environment and tried to setup signing and encrypting certificates using `authserver.pfx`. +We've disabled `AddDevelopmentEncryptionAndSigningCertificate` in the production environment and tried to setup signing and encrypting certificates using `openiddict.pfx` file. -You can use the `dotnet dev-certs https -v -ep authserver.pfx -p 00000000-0000-0000-0000-000000000000` command to generate the `authserver.pfx` certificate. +You can use the `dotnet dev-certs https -v -ep openiddict.pfx -p 00000000-0000-0000-0000-000000000000` command to generate the `authserver.pfx` certificate. > `00000000-0000-0000-0000-000000000000` is the password of the certificate, you can change it to any password you want. -> Also, please remember to copy `authserver.pfx` to the [Content Root Folder](https://learn.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.hosting.ihostingenvironment.contentrootpath?view=aspnetcore-7.0) of the `AuthServer` website. +> Also, please remember to copy `openiddict.pfx` to the [Content Root Folder](https://learn.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.hosting.ihostingenvironment.contentrootpath?view=aspnetcore-7.0) of the `AuthServer` website. + +> It is recommended to use **two** RSA certificates, distinct from the certificate(s) used for HTTPS: one for encryption, one for signing. + +For more information, please refer to: https://documentation.openiddict.com/configuration/encryption-and-signing-credentials.html#registering-a-certificate-recommended-for-production-ready-scenarios diff --git a/docs/en/Multi-Tenancy.md b/docs/en/Multi-Tenancy.md index 19cf8fa443..661d99da16 100644 --- a/docs/en/Multi-Tenancy.md +++ b/docs/en/Multi-Tenancy.md @@ -273,7 +273,7 @@ Configure(options => ##### Domain/Subdomain Tenant Resolver -In a real application, most of times you will want to determine current tenant either by subdomain (like mytenant1.mydomain.com) or by the whole domain (like mytenant.com). If so, you can configure the `AbpTenantResolveOptions` to add the domain tenant resolver. +In a real application, most of times you will want to determine the current tenant either by subdomain (like mytenant1.mydomain.com) or by the whole domain (like mytenant.com). If so, you can configure the `AbpTenantResolveOptions` to add the domain tenant resolver. **Example: Add a subdomain resolver** @@ -284,11 +284,65 @@ Configure(options => }); ```` -* `{0}` is the placeholder to determine current tenant's unique name. +* `{0}` is the placeholder to determine the current tenant's unique name. * Add this code to the `ConfigureServices` method of your [module](Module-Development-Basics.md). * This should be done in the *Web/API Layer* since the URL is a web related stuff. -> There is an [example](https://github.com/abpframework/abp-samples/tree/master/DomainTenantResolver) that uses the subdomain to determining the current tenant. +Openiddict is the default Auth Server in ABP (since v6.0). When you use OpenIddict, you must add this code to the `PreConfigure` method as well. + +```csharp +// using Volo.Abp.OpenIddict.WildcardDomains + +PreConfigure(options => +{ + options.EnableWildcardDomainSupport = true; + options.WildcardDomainsFormat.Add("https://{0}.mydomain.com"); +}); +``` + +You must add this code to the `Configure` method as well. + +```csharp +// using Volo.Abp.MultiTenancy; + +Configure(options => +{ + options.AddDomainTenantResolver("{0}.mydomain.com"); +}); + +``` + +> There is an [example](https://github.com/abpframework/abp-samples/tree/master/DomainTenantResolver) that uses the subdomain to determine the current tenant. + +If you use a sepereted Auth server, you must install `[Owl.TokenWildcardIssuerValidator](https://www.nuget.org/packages/Owl.TokenWildcardIssuerValidator)` on the `HTTPApi.Host` project + +```bash +dotnet add package Owl.TokenWildcardIssuerValidator +``` + +Then fix the options of the `.AddJwtBearer` block + +```csharp +// using using Owl.TokenWildcardIssuerValidator; + +context.Services + .AddAuthentication(JwtBearerDefaults.AuthenticationScheme) + .AddJwtBearer(options => + { + options.Authority = configuration["AuthServer:Authority"]; + options.RequireHttpsMetadata = Convert.ToBoolean(configuration["AuthServer:RequireHttpsMetadata"]); + options.Audience = "ExampleProjectName"; + + // start of added block + options.TokenValidationParameters.IssuerValidator = TokenWildcardIssuerValidator.IssuerValidator; + options.TokenValidationParameters.ValidIssuers = new[] + { + "https://{0}.mydomain.com:44349/" //the port may different + }; + // end of added block + }); + +``` ##### Custom Tenant Resolvers diff --git a/docs/en/UI/Angular/Multi-Tenancy.md b/docs/en/UI/Angular/Multi-Tenancy.md index 92f76435ca..493f6bf194 100644 --- a/docs/en/UI/Angular/Multi-Tenancy.md +++ b/docs/en/UI/Angular/Multi-Tenancy.md @@ -125,6 +125,37 @@ After this replacement, the app will use the following URLs: The app sends the `__tenant` header that contains the current tenant id on each request. +### Handling Domain-based Tenant not found + +When the application is initialized and a domain-based tenant is active, it makes a request for to validate the tenant. If it cannot be located, the Angular application calls the function. The function displays an error message, but the functionality can be customized by injecting the `TENANT_NOT_FOUND_BY_NAME` token into the function. + +Example: +```ts +import { TENANT_NOT_FOUND_BY_NAME } from '@abp/ng.core'; + +@NgModule({ + imports: [ + // removed for clarity + ], + providers: [ + // removed for clarity + { + provide: TENANT_NOT_FOUND_BY_NAME, + useFactory: function () { + return () => { + window.location.replace('https://abp.io'); + }; + }, + }, + ], + declarations: [AppComponent], + bootstrap: [AppComponent], +}) +export class AppModule {} + +``` + ## See Also - [Multi Tenancy in ABP](../../Multi-Tenancy.md) + diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs index 5b00d15c9e..3c6e891d84 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs @@ -15,6 +15,7 @@ using Volo.Abp.Cli.Commands.Services; using Volo.Abp.Cli.LIbs; using Volo.Abp.Cli.ProjectBuilding; using Volo.Abp.Cli.ProjectBuilding.Building; +using Volo.Abp.Cli.ProjectBuilding.Events; using Volo.Abp.Cli.ProjectBuilding.Templates.App; using Volo.Abp.Cli.ProjectModification; using Volo.Abp.Cli.Utils; @@ -133,7 +134,7 @@ public class NewCommand : ProjectCreationCommandBase, IConsoleCommand, ITransien private async Task CheckCreatedRequirements(ProjectBuildArgs projectArgs) { - var errors = new List(); + var requirementWarningMessages = new List(); if (projectArgs.ExtraProperties.ContainsKey("PreRequirements:Redis")) { @@ -151,15 +152,21 @@ public class NewCommand : ProjectCreationCommandBase, IConsoleCommand, ITransien { if (!isConnected) { - errors.Add("\t* Redis is not installed or not running on your computer."); + requirementWarningMessages.Add("\t* Redis is not installed or not running on your computer."); } } } - if (errors.Any()) + if (requirementWarningMessages.Any()) { - Logger.LogWarning("NOTICE: The following tools are required to run your solution."); - foreach (var error in errors) + requirementWarningMessages.AddFirst("NOTICE: The following tools are required to run your solution:"); + + await EventBus.PublishAsync(new ProjectPostRequirementsCheckedEvent + { + Message = requirementWarningMessages.JoinAsString(Environment.NewLine) + }, false); + + foreach (var error in requirementWarningMessages) { Logger.LogWarning(error); } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/LIbs/InstallLibsService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/LIbs/InstallLibsService.cs index b925a4220c..6329a1c7ca 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/LIbs/InstallLibsService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/LIbs/InstallLibsService.cs @@ -120,7 +120,10 @@ public class InstallLibsService : IInstallLibsService, ITransientDependency using (var reader = File.OpenText(file)) { - return reader.ReadToEnd().Contains("Microsoft.NET.Sdk.Web"); + var fileTexts = reader.ReadToEnd(); + return fileTexts.Contains("Microsoft.NET.Sdk.Web") || + fileTexts.Contains("Microsoft.NET.Sdk.Razor") || + fileTexts.Contains("Microsoft.NET.Sdk.BlazorWebAssembly"); } } return true; diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Events/ProjectPostRequirementsCheckedEvent.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Events/ProjectPostRequirementsCheckedEvent.cs new file mode 100644 index 0000000000..1e20e9a3c9 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Events/ProjectPostRequirementsCheckedEvent.cs @@ -0,0 +1,5 @@ +namespace Volo.Abp.Cli.ProjectBuilding.Events; +public class ProjectPostRequirementsCheckedEvent +{ + public string Message { get; set; } +} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplateBase.cs index edf8728305..9417c46e12 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplateBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplateBase.cs @@ -32,6 +32,7 @@ public abstract class AppNoLayersTemplateBase : AppTemplateBase steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Host.Mongo")); steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.Server.Mongo")); steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.Mongo", projectFolderPath: "/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo")); + SetDbmsSymbols(context); break; case DatabaseProvider.MongoDb: steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Mvc")); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs index 5c9b4f4864..0fecd09eb4 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs @@ -102,6 +102,7 @@ public abstract class AppTemplateBase : TemplateInfo else { context.Symbols.Add("EFCORE"); + SetDbmsSymbols(context); } if (context.BuildArgs.DatabaseProvider != DatabaseProvider.MongoDb) @@ -234,6 +235,36 @@ public abstract class AppTemplateBase : TemplateInfo steps.Add(new ChangeThemeStep()); RemoveLeptonXThemePackagesFromPackageJsonFiles(steps, isProTemplate: IsPro(), uiFramework: context.BuildArgs.UiFramework); } + + protected void SetDbmsSymbols(ProjectBuildContext context) + { + switch (context.BuildArgs.DatabaseManagementSystem) + { + case DatabaseManagementSystem.NotSpecified: + context.Symbols.Add("SqlServer"); + break; + case DatabaseManagementSystem.SQLServer: + context.Symbols.Add("SqlServer"); + break; + case DatabaseManagementSystem.MySQL: + context.Symbols.Add("MySql"); + break; + case DatabaseManagementSystem.PostgreSQL: + context.Symbols.Add("PostgreSql"); + break; + case DatabaseManagementSystem.Oracle: + context.Symbols.Add("Oracle"); + break; + case DatabaseManagementSystem.OracleDevart: + context.Symbols.Add("Oracle"); + break; + case DatabaseManagementSystem.SQLite: + context.Symbols.Add("SqLite"); + break; + default: + throw new AbpException("Unknown Dbms: " + context.BuildArgs.DatabaseManagementSystem); + } + } private void RemoveThemeLogoFolders(ProjectBuildContext context, List steps) { diff --git a/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/AbpConfigurationExtensions.cs b/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/AbpConfigurationExtensions.cs new file mode 100644 index 0000000000..6e0a14fd94 --- /dev/null +++ b/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/AbpConfigurationExtensions.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Text; +using Microsoft.Extensions.Hosting; + +namespace Microsoft.Extensions.Configuration; + +public static class AbpConfigurationExtensions +{ + public static IConfigurationBuilder AddAppSettingsSecretsJson( + this IConfigurationBuilder builder, + bool optional = true, + bool reloadOnChange = true, + string path = AbpHostingHostBuilderExtensions.AppSettingsSecretJsonPath) + { + return builder.AddJsonFile(path: path, optional: optional, reloadOnChange: reloadOnChange); + } +} diff --git a/framework/src/Volo.Abp.Core/Microsoft/Extensions/Hosting/AbpHostExtensions.cs b/framework/src/Volo.Abp.Core/Microsoft/Extensions/Hosting/AbpHostExtensions.cs new file mode 100644 index 0000000000..12c03e14f5 --- /dev/null +++ b/framework/src/Volo.Abp.Core/Microsoft/Extensions/Hosting/AbpHostExtensions.cs @@ -0,0 +1,20 @@ +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp; +using Volo.Abp.Threading; + +namespace Microsoft.Extensions.Hosting; + +public static class AbpHostExtensions +{ + public static async Task InitializeAsync(this IHost host) + { + var application = host.Services.GetRequiredService(); + var applicationLifetime = host.Services.GetRequiredService(); + + applicationLifetime.ApplicationStopping.Register(() => AsyncHelper.RunSync(() => application.ShutdownAsync())); + applicationLifetime.ApplicationStopped.Register(() => application.Dispose()); + + await application.InitializeAsync(host.Services); + } +} diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ValueComparers/ExtraPropertyDictionaryValueComparer.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ValueComparers/ExtraPropertyDictionaryValueComparer.cs index dca9ee0fc0..27701d196d 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ValueComparers/ExtraPropertyDictionaryValueComparer.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ValueComparers/ExtraPropertyDictionaryValueComparer.cs @@ -9,9 +9,29 @@ public class ExtraPropertyDictionaryValueComparer : ValueComparer d1!.SequenceEqual(d2!), - d => d.Aggregate(0, (k, v) => HashCode.Combine(k, v.GetHashCode())), - d => new ExtraPropertyDictionary(d)) + (a, b) => Compare(a, b), + d => d.Aggregate(0, (k, v) => HashCode.Combine(k, v.GetHashCode())), + d => new ExtraPropertyDictionary(d)) { } + + private static bool Compare(ExtraPropertyDictionary? a, ExtraPropertyDictionary? b) + { + if (ReferenceEquals(a, b)) + { + return true; + } + + if (a is null) + { + return b is null; + } + + if (b is null) + { + return false; + } + + return a!.SequenceEqual(b!); + } } diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpHttpClientModule.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpHttpClientModule.cs index dc14ee4203..c0dfeabbd1 100644 --- a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpHttpClientModule.cs +++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpHttpClientModule.cs @@ -1,11 +1,15 @@ -using Microsoft.Extensions.DependencyInjection; +using System.Collections.Generic; +using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Castle; +using Volo.Abp.Data; using Volo.Abp.EventBus; using Volo.Abp.Modularity; using Volo.Abp.MultiTenancy; using Volo.Abp.Threading; using Volo.Abp.Validation; using Volo.Abp.ExceptionHandling; +using Volo.Abp.Http.Client.ClientProxying; +using Volo.Abp.Http.Client.ClientProxying.ExtraPropertyDictionaryConverts; using Volo.Abp.Http.Client.DynamicProxying; using Volo.Abp.RemoteServices; @@ -27,5 +31,11 @@ public class AbpHttpClientModule : AbpModule { context.Services.AddHttpClient(); context.Services.AddTransient(typeof(DynamicHttpProxyInterceptorClientProxy<>)); + + Configure(options => + { + options.QueryStringConverts.Add(typeof(ExtraPropertyDictionary), typeof(ExtraPropertyDictionaryToQueryString)); + options.FormDataConverts.Add(typeof(ExtraPropertyDictionary), typeof(ExtraPropertyDictionaryToFormData)); + }); } } diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ExtraPropertyDictionaryConverts/ExtraPropertyDictionaryToFormData.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ExtraPropertyDictionaryConverts/ExtraPropertyDictionaryToFormData.cs new file mode 100644 index 0000000000..72cfb55156 --- /dev/null +++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ExtraPropertyDictionaryConverts/ExtraPropertyDictionaryToFormData.cs @@ -0,0 +1,28 @@ +using System.Collections.Generic; +using System.Net.Http; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.Data; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Http.Modeling; + +namespace Volo.Abp.Http.Client.ClientProxying.ExtraPropertyDictionaryConverts; + +public class ExtraPropertyDictionaryToFormData : IObjectToFormData, ITransientDependency +{ + public Task>> ConvertAsync(ActionApiDescriptionModel actionApiDescription, ParameterApiDescriptionModel parameterApiDescription, ExtraPropertyDictionary extraPropertyDictionary) + { + if (extraPropertyDictionary.IsNullOrEmpty()) + { + return Task.FromResult>>(null!); + } + + var formDataContents = new List>(); + foreach (var item in extraPropertyDictionary) + { + formDataContents.Add(new KeyValuePair($"ExtraProperties[{item.Key}]", new StringContent(item.Value!.ToString()!, Encoding.UTF8))); + } + + return Task.FromResult(formDataContents); + } +} diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ExtraPropertyDictionaryConverts/ExtraPropertyDictionaryToQueryString.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ExtraPropertyDictionaryConverts/ExtraPropertyDictionaryToQueryString.cs new file mode 100644 index 0000000000..a1b2919615 --- /dev/null +++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/ExtraPropertyDictionaryConverts/ExtraPropertyDictionaryToQueryString.cs @@ -0,0 +1,31 @@ +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.Data; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Http.Modeling; + +namespace Volo.Abp.Http.Client.ClientProxying.ExtraPropertyDictionaryConverts; + +public class ExtraPropertyDictionaryToQueryString : IObjectToQueryString, ITransientDependency +{ + public Task ConvertAsync(ActionApiDescriptionModel actionApiDescription, ParameterApiDescriptionModel parameterApiDescription, ExtraPropertyDictionary extraPropertyDictionary) + { + if (extraPropertyDictionary.IsNullOrEmpty()) + { + return Task.FromResult(null!); + } + + var sb = new StringBuilder(); + foreach (var item in extraPropertyDictionary) + { + sb.Append($"ExtraProperties[{item.Key}]={item.Value}&"); + } + if (sb.Length > 0) + { + sb.Remove(sb.Length - 1, 1); + } + + return Task.FromResult(sb.ToString()); + } +} diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/Migrations/MongoDatabaseMigrationEventHandlerBase.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/Migrations/MongoDatabaseMigrationEventHandlerBase.cs new file mode 100644 index 0000000000..36a86551c5 --- /dev/null +++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/Migrations/MongoDatabaseMigrationEventHandlerBase.cs @@ -0,0 +1,58 @@ +using System; +using System.Threading.Tasks; +using Volo.Abp.DependencyInjection; +using Volo.Abp.EventBus.Distributed; +using Volo.Abp.MultiTenancy; + +namespace Volo.Abp.MongoDB.Migrations; + +public abstract class MongoDatabaseMigrationEventHandlerBase : + IDistributedEventHandler, + IDistributedEventHandler, + ITransientDependency + where TDbContext : IAbpMongoDbContext +{ + protected string DatabaseName { get; } + + + protected MongoDatabaseMigrationEventHandlerBase(string databaseName) + { + DatabaseName = databaseName; + } + + public virtual async Task HandleEventAsync(TenantCreatedEto eventData) + { + await SeedAsync(eventData.Id); + + await AfterTenantCreated(eventData); + } + + protected virtual Task AfterTenantCreated(TenantCreatedEto eventData) + { + return Task.CompletedTask; + } + + public virtual async Task HandleEventAsync(TenantConnectionStringUpdatedEto eventData) + { + if (eventData.ConnectionStringName != DatabaseName && + eventData.ConnectionStringName != Data.ConnectionStrings.DefaultConnectionStringName || + eventData.NewValue.IsNullOrWhiteSpace()) + { + return; + } + + await SeedAsync(eventData.Id); + + await AfterTenantConnectionStringUpdated(eventData); + } + + protected virtual Task AfterTenantConnectionStringUpdated(TenantConnectionStringUpdatedEto eventData) + { + return Task.CompletedTask; + } + + protected virtual Task SeedAsync(Guid? tenantId) + { + return Task.CompletedTask; + } +} \ No newline at end of file diff --git a/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/PersonAppServiceClientProxy_Tests.cs b/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/PersonAppServiceClientProxy_Tests.cs index fbaf6b4d3e..7671dcf0cb 100644 --- a/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/PersonAppServiceClientProxy_Tests.cs +++ b/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/PersonAppServiceClientProxy_Tests.cs @@ -12,6 +12,7 @@ using Shouldly; using Volo.Abp.Application.Dtos; using Volo.Abp.AspNetCore.Mvc.Conventions; using Volo.Abp.Content; +using Volo.Abp.Data; using Volo.Abp.Domain.Repositories; using Volo.Abp.Http.Client; using Volo.Abp.TestApp.Application; @@ -280,7 +281,7 @@ public class PersonAppServiceClientProxy_Tests : AbpHttpClientTestBase [Fact] public async Task GetParamsFromQueryAsync() { - var result = await _peopleAppService.GetParamsFromQueryAsync(new GetParamsInput() + var input = new GetParamsInput() { NameValues = new List() { @@ -300,34 +301,39 @@ public class PersonAppServiceClientProxy_Tests : AbpHttpClientTestBase Name = "name3", Value = "value3" } - }); - result.ShouldBe("name1-value1:name2-value2:name3-value3"); + }; + input.SetProperty("TestProperty", "TestPropertyValue"); + foreach (var nameValue in input.NameValues) + { + nameValue.SetProperty("TestPropertyInList", "TestPropertyValueInList"); + } + + var result = await _peopleAppService.GetParamsFromQueryAsync(input); + result.ShouldBe("name1-value1:TestPropertyValueInList:name2-value2:name3-value3:TestPropertyValue"); } [Fact] public async Task GetParamsFromFormAsync() { - var result = await _peopleAppService.GetParamsFromFormAsync(new GetParamsInput() + var input = new GetParamsInput() { NameValues = new List() { - new GetParamsNameValue() - { - Name = "name1", - Value = "value1" - }, - new GetParamsNameValue() - { - Name = "name2", - Value = "value2" - } + new GetParamsNameValue() {Name = "name1", Value = "value1"}, + new GetParamsNameValue() {Name = "name2", Value = "value2"} }, NameValue = new GetParamsNameValue() { - Name = "name3", - Value = "value3" + Name = "name3", Value = "value3" } - }); - result.ShouldBe("name1-value1:name2-value2:name3-value3"); + }; + input.SetProperty("TestProperty", "TestPropertyValue"); + foreach (var nameValue in input.NameValues) + { + nameValue.SetProperty("TestPropertyInList", "TestPropertyValueInList"); + } + + var result = await _peopleAppService.GetParamsFromFormAsync(input); + result.ShouldBe("name1-value1:TestPropertyValueInList:name2-value2:name3-value3:TestPropertyValue"); } } diff --git a/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/TestObjectToFormData.cs b/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/TestObjectToFormData.cs index 2c64773c88..9e3a5d28dd 100644 --- a/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/TestObjectToFormData.cs +++ b/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/TestObjectToFormData.cs @@ -23,6 +23,11 @@ public class TestObjectToFormData : IObjectToFormData>, { formDataContents.Add(new KeyValuePair($"NameValues[{i}].Name", new StringContent(values[i].Name, Encoding.UTF8))); formDataContents.Add(new KeyValuePair($"NameValues[{i}].Value", new StringContent(values[i].Value, Encoding.UTF8))); + + foreach (var item in values[i].ExtraProperties) + { + formDataContents.Add(new KeyValuePair($"NameValues[{i}].ExtraProperties[{item.Key}]", new StringContent(item.Value!.ToString()!, Encoding.UTF8))); + } } return Task.FromResult(formDataContents); diff --git a/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/TestObjectToQueryString.cs b/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/TestObjectToQueryString.cs index d4ca6f7285..a27528cb77 100644 --- a/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/TestObjectToQueryString.cs +++ b/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/TestObjectToQueryString.cs @@ -22,6 +22,10 @@ public class TestObjectToQueryString : IObjectToQueryString NameValues { get; set; } public GetParamsNameValue NameValue { get; set; } } -public class GetParamsNameValue +public class GetParamsNameValue : ExtensibleObject { public string Name { get; set; } diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/PeopleAppService.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/PeopleAppService.cs index 752a548320..a7d64228bd 100644 --- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/PeopleAppService.cs +++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/PeopleAppService.cs @@ -129,17 +129,19 @@ public class PeopleAppService : CrudAppService, IPeople public Task GetParamsFromQueryAsync([FromQuery] GetParamsInput input) { - return Task.FromResult(input.NameValues?.FirstOrDefault()?.Name + "-" + - input.NameValues?.FirstOrDefault()?.Value + ":" + + return Task.FromResult(input.NameValues?.FirstOrDefault()?.Name + "-" + input.NameValues?.FirstOrDefault()?.Value + ":" + + input.NameValues?.FirstOrDefault()?.ExtraProperties["TestPropertyInList"] + ":" + input.NameValues?.LastOrDefault()?.Name + "-" + input.NameValues?.LastOrDefault()?.Value + ":" + - input.NameValue?.Name + "-" + input.NameValue?.Value); + input.NameValue?.Name + "-" + input.NameValue?.Value + ":" + + input.ExtraProperties["TestProperty"]); } public Task GetParamsFromFormAsync([FromForm] GetParamsInput input) { - return Task.FromResult(input.NameValues?.FirstOrDefault()?.Name + "-" + - input.NameValues?.FirstOrDefault()?.Value + ":" + + return Task.FromResult(input.NameValues?.FirstOrDefault()?.Name + "-" + input.NameValues?.FirstOrDefault()?.Value + ":" + + input.NameValues?.FirstOrDefault()?.ExtraProperties["TestPropertyInList"] + ":" + input.NameValues?.LastOrDefault()?.Name + "-" + input.NameValues?.LastOrDefault()?.Value + ":" + - input.NameValue?.Name + "-" + input.NameValue?.Value); + input.NameValue?.Name + "-" + input.NameValue?.Value + ":" + + input.ExtraProperties["TestProperty"]); } } diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/AccountPageModel.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/AccountPageModel.cs index ebd556f8e2..f229253c4a 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/AccountPageModel.cs +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/AccountPageModel.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Threading.Tasks; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Options; using Volo.Abp.Account.Localization; @@ -54,4 +55,22 @@ public abstract class AccountPageModel : AbpPageModel return exception.Message; } + + protected virtual async Task GetUserNameFromEmail(string email) + { + var userName = email.Split('@')[0]; + var existUser = await UserManager.FindByNameAsync(userName); + while (existUser != null) + { + var randomUserName = userName + RandomHelper.GetRandom(1000, 9999); + existUser = await UserManager.FindByNameAsync(randomUserName); + if (existUser == null) + { + userName = randomUserName; + break; + } + } + + return userName; + } } diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs index 9d6e2d8b9b..187d1b9f4f 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs @@ -269,8 +269,9 @@ public class LoginModel : AccountPageModel await IdentityOptions.SetAsync(); var emailAddress = info.Principal.FindFirstValue(AbpClaimTypes.Email); + var userName = await GetUserNameFromEmail(emailAddress); - var user = new IdentityUser(GuidGenerator.Create(), emailAddress, emailAddress, CurrentTenant.Id); + var user = new IdentityUser(GuidGenerator.Create(), userName, emailAddress, CurrentTenant.Id); CheckIdentityErrors(await UserManager.CreateAsync(user)); CheckIdentityErrors(await UserManager.SetEmailAsync(user, emailAddress)); diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml index 137715804a..fabe41ae6f 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml @@ -12,11 +12,11 @@ @L["Login"]
- @if (!Model.IsExternalLogin && Model.EnableLocalRegister) + @if ((!Model.IsExternalLogin || Model.UserNameExtracted) && Model.EnableLocalRegister) { } - + @if(Model.EnableLocalRegister || Model.IsExternalLogin) { @@ -26,16 +26,16 @@ { } - + @if(Model.EnableLocalRegister || Model.IsExternalLogin) {
@L["Register"]
} - + - + @if (!Model.IsExternalLogin && Model.VisibleExternalProviders.Any()) {
@@ -48,6 +48,6 @@
} - + diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs index 7bc536ba9d..1ef7f00d55 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs @@ -35,19 +35,20 @@ public class RegisterModel : AccountPageModel [BindProperty(SupportsGet = true)] public string ExternalLoginAuthSchema { get; set; } - + + public bool UserNameExtracted { get; set; } public IEnumerable ExternalProviders { get; set; } public IEnumerable VisibleExternalProviders => ExternalProviders.Where(x => !string.IsNullOrWhiteSpace(x.DisplayName)); public bool EnableLocalRegister { get; set; } public bool IsExternalLoginOnly => EnableLocalRegister == false && ExternalProviders?.Count() == 1; public string ExternalLoginScheme => IsExternalLoginOnly ? ExternalProviders?.SingleOrDefault()?.AuthenticationScheme : null; - + protected IAuthenticationSchemeProvider SchemeProvider { get; } - + protected AbpAccountOptions AccountOptions { get; } public RegisterModel( - IAccountAppService accountAppService, + IAccountAppService accountAppService, IAuthenticationSchemeProvider schemeProvider, IOptions accountOptions) { @@ -66,16 +67,16 @@ public class RegisterModel : AccountPageModel { return await OnPostExternalLogin(ExternalLoginScheme); } - + Alerts.Warning(L["SelfRegistrationDisabledMessage"]); } - + await TrySetEmailAsync(); - + return Page(); } - private async Task TrySetEmailAsync() + protected virtual async Task TrySetEmailAsync() { if (IsExternalLogin) { @@ -98,7 +99,8 @@ public class RegisterModel : AccountPageModel return; } - Input = new PostInput { EmailAddress = emailClaim.Value }; + var userName = await GetUserNameFromEmail(emailClaim.Value); + Input = new PostInput { UserName = userName, EmailAddress = emailClaim.Value }; } } @@ -121,8 +123,12 @@ public class RegisterModel : AccountPageModel Logger.LogWarning("External login info is not available"); return RedirectToPage("./Login"); } - - await RegisterExternalUserAsync(externalLoginInfo, Input.EmailAddress); + if (Input.UserName.IsNullOrWhiteSpace()) + { + Input.UserName = await GetUserNameFromEmail(Input.EmailAddress); + } + UserNameExtracted = true; + await RegisterExternalUserAsync(externalLoginInfo, Input.UserName, Input.EmailAddress); } else { @@ -156,11 +162,11 @@ public class RegisterModel : AccountPageModel await SignInManager.SignInAsync(user, isPersistent: true); } - protected virtual async Task RegisterExternalUserAsync(ExternalLoginInfo externalLoginInfo, string emailAddress) + protected virtual async Task RegisterExternalUserAsync(ExternalLoginInfo externalLoginInfo, string userName, string emailAddress) { await IdentityOptions.SetAsync(); - var user = new IdentityUser(GuidGenerator.Create(), emailAddress, emailAddress, CurrentTenant.Id); + var user = new IdentityUser(GuidGenerator.Create(), userName, emailAddress, CurrentTenant.Id); (await UserManager.CreateAsync(user)).CheckErrors(); (await UserManager.AddDefaultRolesAsync(user)).CheckErrors(); @@ -191,7 +197,7 @@ public class RegisterModel : AccountPageModel { return true; } - + if (!EnableLocalRegister) { return false; @@ -199,10 +205,9 @@ public class RegisterModel : AccountPageModel return true; } - + protected virtual async Task> GetExternalProviders() { - var schemes = await SchemeProvider.GetAllSchemesAsync(); return schemes @@ -214,7 +219,7 @@ public class RegisterModel : AccountPageModel }) .ToList(); } - + protected virtual async Task OnPostExternalLogin(string provider) { var redirectUrl = Url.Page("./Login", pageHandler: "ExternalLoginCallback", values: new { ReturnUrl, ReturnUrlHash }); @@ -241,7 +246,7 @@ public class RegisterModel : AccountPageModel [DisableAuditing] public string Password { get; set; } } - + public class ExternalProviderModel { public string DisplayName { get; set; } diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml index 1ffdf2595e..f146878b0f 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml @@ -31,10 +31,7 @@ diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json index 6d2e55df22..c3848ad17b 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json @@ -3,7 +3,7 @@ "name": "asp.net", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~7.4.0-rc.4", + "@abp/aspnetcore.mvc.ui.theme.shared": "~7.4.0-rc.5", "@abp/prismjs": "^~7.3.2", "@abp/highlight.js": "^~7.3.2" }, diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json index c407d48d1d..c4915ba7fe 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json @@ -3,8 +3,8 @@ "name": "asp.net", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.4", - "@abp/prismjs": "~7.4.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.5", + "@abp/prismjs": "~7.4.0-rc.5" }, "devDependencies": {} } diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock index ad399ee576..f76081715b 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock @@ -2,39 +2,39 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.4.tgz#4b53752513bf727b4962093d8ff4daac66139718" - integrity sha512-Jj3faRxJdaaoJzPcyhJgb7/8+7oEK6rRY4R3uP5pF50khR/yNHWcLP6WCZ+LQZu7fKlEpiQ5EITiWRpP/5hf/w== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.4" - -"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.4.tgz#9f8b6c33c17da1c0bc0c596ef2fb9fe93248c7fb" - integrity sha512-lL6WWRSsrDIGBQl3tNFifLt08JEQycCrK0E57F3NquviFY/erducHp+dfJJ+s1OAadUlkvmsB5Scs8xQMQCaig== - dependencies: - "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.4" - "@abp/bootstrap" "~7.4.0-rc.4" - "@abp/bootstrap-datepicker" "~7.4.0-rc.4" - "@abp/bootstrap-daterangepicker" "~7.4.0-rc.4" - "@abp/datatables.net-bs5" "~7.4.0-rc.4" - "@abp/font-awesome" "~7.4.0-rc.4" - "@abp/jquery-form" "~7.4.0-rc.4" - "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.4" - "@abp/lodash" "~7.4.0-rc.4" - "@abp/luxon" "~7.4.0-rc.4" - "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.4" - "@abp/moment" "~7.4.0-rc.4" - "@abp/select2" "~7.4.0-rc.4" - "@abp/sweetalert2" "~7.4.0-rc.4" - "@abp/timeago" "~7.4.0-rc.4" - "@abp/toastr" "~7.4.0-rc.4" - -"@abp/aspnetcore.mvc.ui@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.4.tgz#3854183dea1a24dee42debc0a5413de0f08d3d0d" - integrity sha512-TTAnlbh8KcDWakMCtawHgrbcmoqvLdLxz1DDWUTkmCEQPImdrh52Jf1LNrL/771hug1dk5kqAuH5R5nBFGfnbA== +"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.5.tgz#20fb27493a42a88adf423862f79031a840fb741e" + integrity sha512-1pjQT+JWd+5Cqfzvt1CGii8Igd2YVpMd5vRYXkogKdjtJiElgaJwIbhjGMnV/neaSF2eR6y5g1SW6BP6NNN8yA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.5" + +"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.5.tgz#ebf4732a466ea187afb870571aea2862e278906a" + integrity sha512-EOtOHV9yEHX8dL0tSDTDQYXDVsNIuItDb5TpF30Jg8JIkz2xGnijXh71BmVb2QF7mZ2Q048BhAPc3s0i9cWU0g== + dependencies: + "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.5" + "@abp/bootstrap" "~7.4.0-rc.5" + "@abp/bootstrap-datepicker" "~7.4.0-rc.5" + "@abp/bootstrap-daterangepicker" "~7.4.0-rc.5" + "@abp/datatables.net-bs5" "~7.4.0-rc.5" + "@abp/font-awesome" "~7.4.0-rc.5" + "@abp/jquery-form" "~7.4.0-rc.5" + "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.5" + "@abp/lodash" "~7.4.0-rc.5" + "@abp/luxon" "~7.4.0-rc.5" + "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.5" + "@abp/moment" "~7.4.0-rc.5" + "@abp/select2" "~7.4.0-rc.5" + "@abp/sweetalert2" "~7.4.0-rc.5" + "@abp/timeago" "~7.4.0-rc.5" + "@abp/toastr" "~7.4.0-rc.5" + +"@abp/aspnetcore.mvc.ui@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.5.tgz#a71ff2736472b8028e09a6de1e998c9523c00f81" + integrity sha512-meoBTIfJ88Fp9HZKRTn9URXSMGGUioRIFr206VVE2pwOqO5lLKTbRkpeSM46uzLNoWRj+Rn4NDKdYdEsjWj1IQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,175 +43,175 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.4.tgz#2fe2c68d628383d1d8ff349dfb7da9b5b4eb04c1" - integrity sha512-C+vLaehe6lZhLPuJM5ZfwsHOqt3htOVpyjZvBwyX3DdXIwsLpg7nCvTPgtXbt1CNSJ3aePkbdQDEaLv603WRGw== +"@abp/bootstrap-datepicker@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.5.tgz#943ef8fb6bc984788f08a828a187495bc8fc3be8" + integrity sha512-bhBiHDichxIsqN8FyeFkViOyGnQyLs9RG+ZIRnM7l9zP+8m7InB+RFbRCi7IRLnNVoT9C+Fy5O9kOhTyd48dkg== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.4.tgz#d8b950f91d5963ef7725f2bc69b80c24b3626235" - integrity sha512-ehoqkI07UGc/MbhENOV7BkB67VNyRa8lYC9gBBlD+59VAsg1f3b/UzVJGnTvcPPPwA4SyJL56dDZbxj8uI1TAQ== +"@abp/bootstrap-daterangepicker@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.5.tgz#052393e99a181fe48814a86b3adb47e302ef1d50" + integrity sha512-N4gBrfOA9Jl9qcDo8EAgGI1SZHnQb7bFcAdW2rQlRhCYuhd89wR3RWqsljh+UwEBqu/LPzYMGTQ+TLdLHi2rug== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.4.tgz#794850366d0a85a6e2ad703590ad91f5616d50ad" - integrity sha512-+tcO/o1hnpiI8HPjnh5BGZn7NbVnQsKAgR5nJkZvHlVdsiFnufgtVfKoM0n7lalN/h0caCLbBxkS+OVrpTCv6Q== +"@abp/bootstrap@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.5.tgz#5718af8004ac3dc00c451cab07a4260ca0e45ac5" + integrity sha512-FAB+yeKXn+P0YuuzFYrBUAQSEIoIm7FSwxb13ouCRb17XgHXcSp2ikdPIMcctGnq/Af31WxfJjCWGLNVcZCCmw== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" bootstrap "^5.1.3" -"@abp/clipboard@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-7.4.0-rc.4.tgz#555f72dab99343520784cbb1cb3c6c50086500c0" - integrity sha512-p4Px63x5VaS7buwg/0TU26LIZ+LPAQOBAvlHWXl8QhvpdN5OjZPX+GyvEW4UkzcNbyoB7bn9bBUYRD1cDSmlzQ== +"@abp/clipboard@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-7.4.0-rc.5.tgz#54ca41b3284552a6595fda51caf12d715d3f64f5" + integrity sha512-1+XKIOPM77msa+xfWsFFZzLc450q2vq3/dDKSkFqKxj4PfnM5jqijoptG0k0EcBojOfTURESwREE1Xqjn3OjHg== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" clipboard "^2.0.8" -"@abp/core@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.4.tgz#4a2aebc67fdd1f9296d34c33cba7d3b5d5b186d6" - integrity sha512-nBEks/7mCqYEhvKZtda6bi56eh0hiVym+/VCe9D9YXSVuFAoudmN1KyBL1/HLrJOFYCenP8TQMXDxXg9Qv4ILQ== +"@abp/core@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.5.tgz#93eb68ac9828c4ce66355e651f194fcc5e171bf3" + integrity sha512-2oqRviXbS1Avuj63u/s8AjnLEuR4FvG+hpk81DA39hNiNPvwosG24Ie9nxaa0A5F7kcCEvRM7JAmc/0MQ7FJKg== dependencies: - "@abp/utils" "~7.4.0-rc.4" + "@abp/utils" "~7.4.0-rc.5" -"@abp/datatables.net-bs5@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.4.tgz#cc205cdee4d24e9b9059797443cb52996f42b431" - integrity sha512-DnKtYe9LgYfRAATQRlbs90jDH4KM6jbYIcXht/CibU8c/hGWXver/wk+13w4lMlzm+eDw/yJ1qNKfFTYMCXaBw== +"@abp/datatables.net-bs5@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.5.tgz#036e98a69c7bb51f56755b93912c00841ffc6e00" + integrity sha512-OZlNJynMFus4AxPMoCAfIE15X3PdGB5UwKJTi7XCza4Ok3F+mevmsIwOpjLqs1OpbLEIHK3Ftk6nXfTMpFZQpQ== dependencies: - "@abp/datatables.net" "~7.4.0-rc.4" + "@abp/datatables.net" "~7.4.0-rc.5" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.4.tgz#eb9458cd0f0c1f1de9321bb2e637357e67ac68d9" - integrity sha512-OipmXFl4b//5agl+zIhhDT9tpt/QLcd6Ux+Ual8Wavh2YuGU7KDgCBWPN9W9McCfyExtejjp1H0epk6rl/EMXg== +"@abp/datatables.net@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.5.tgz#32fa40f3a1f397faf06b25e3653cdfb74256a2e5" + integrity sha512-grRRJfrDZz4v8t0QP1/bXlDNcZpWdcxLI4MsHORekt9EXrWx2iWtcZt4yhs7GLhX2swc6VuNf3OCO8/S5obQpQ== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" datatables.net "^1.11.4" -"@abp/font-awesome@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.4.tgz#720c32147bc5590b52911121a01a5f951ca09092" - integrity sha512-6gmsa42ernWVU8jfUl+ZpoSnSbr9Gc8nhl+cMKwo7AkbPvtMhR/tnH0v+4/0wJl+SWelvXeTWL7OHi3ZmFsNgA== +"@abp/font-awesome@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.5.tgz#1171b3556eac71894083bfe0776dd170783d8f17" + integrity sha512-UUJZ2Q7pYag4j6C83ElV7z3eG72HthpJW/RQ4/rMjoeW5Dbduomuihx0WtDqtoNmsYdjH7Z0nWUhKzRUv3Yo9Q== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.4.tgz#669f9adda562867e8db075718577c8fe0222f979" - integrity sha512-MOqz5rIL3gZaABvGI5veMDZOl/8O+i5uJagmLpvjY9rau8tygJQ7t7pYHQEMlfQchNRb/m7p5WSgmvZ/R80BKw== +"@abp/jquery-form@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.5.tgz#a3a66b333c839f36af88808cf4588162fdf8237f" + integrity sha512-PotRlDmzxnG6zk8yAJCR6MthK5tWH6disgWPsCxl+UN6d470V24ei0ZWx/eN2YKxRnRYLrrdvbgH9OMM7Clq9g== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.4.tgz#7092b57d7362a4e201f82c41f4ef38edc50acf95" - integrity sha512-DUvT1jMt4YwML3oTXA369NaQGWVR2nDDf0J6RfHjzT1geSzJiquYN2PAZ7u/tPqQgbS62+HIvI+zbWZ1rNJ6XA== +"@abp/jquery-validation-unobtrusive@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.5.tgz#7796c2bb644ebdff18e2c74822570a710d0d863e" + integrity sha512-6YWYUfPfjf1fZIEWHR9wqzJuWI1hmrGnm9uILZ9o829pvqdC7ctqemv2+PwSYPDzTcmk5ys54NHcXcwq8/H/JA== dependencies: - "@abp/jquery-validation" "~7.4.0-rc.4" + "@abp/jquery-validation" "~7.4.0-rc.5" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.4.tgz#b74f2d0138b7caf46c0085e57fcdba92a917f55a" - integrity sha512-qaYmHUr6/d13LSXHII8XIE1MuVbBPswToKN7y0uw3joFcw7NyQCEOkAkTxpGy0V6uhP/4zbxs90SYkJfy60zww== +"@abp/jquery-validation@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.5.tgz#e27d2936d6dc0fb9182f1cf1f73019b2e1873b87" + integrity sha512-O1RSRI1UH8ZTMBTfkQG+LSvE+4W5W93Rw0bUJV8dI5lWT9cBuoQkWVLqOZqr9JX9ZMuYMf4GDyWYYT5MS4+EQQ== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" jquery-validation "^1.19.3" -"@abp/jquery@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.4.tgz#615c4a40b451cd526085a69335bc6f41ebe99223" - integrity sha512-fuU5bt4x2NBeJXOCEyfeDPo8UiVoKqgjuKvXLoiAvt+za5qGitRQuPbJAakDKVxGWa7idu/d/8oYLWEqWw3Luw== +"@abp/jquery@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.5.tgz#fb664d1706e2ff02f24bf910363ff8221a447b7c" + integrity sha512-o/bTJKO7g9H0NChDtgYanG049Zihmojlt86fNfJ5p0uCRAbkrLnUQfOqTw5NhtQAbPmNyR+pK6Tk9oKlN6/V0Q== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" jquery "~3.6.0" -"@abp/lodash@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.4.tgz#0c94552b4debf025afdfe636cca753169dbcba85" - integrity sha512-oWrSBwDRb7EfvnHiPYSLzIuwZ6rvm4j6yjtxIe1rQt4X9aWENVXUPtg6ZG59kpZGEAFcIC5xJcTNfkLui7Xorw== +"@abp/lodash@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.5.tgz#68123983a07f334230692a2a9750b0f3a9681000" + integrity sha512-MleBwBDXCg4pLyQVAU94/j5wPFhsZ3GU8UlBokhS8QXu4J444GyBH6DCes9VPFvAcKe0WJzCNe2wPn9GU2bmiA== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" lodash "^4.17.21" -"@abp/luxon@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.4.tgz#6c6247b5672bfd49ef64a3a3ea94aa74eeeeaae8" - integrity sha512-B2QYSAP8UInRoMEo+X9499s1VVDpjIbojTIqENufouGUqdRlDN+0ZJYHKmliQloQ1HZdGHOs0z8kFA4at+bsgQ== +"@abp/luxon@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.5.tgz#2a5ba7a7d43d35b8ed7e839b85518e26afe21890" + integrity sha512-E5PsSaLRwziJsi0OVBokZ7n1SCzBBQv25P9bc29aC0t8rjHNpkmhR7zHDF3XgUQSTiBWy35l69l+ZD9AEhm9ZA== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.4.tgz#7aacc70573587058a49f9d464c8fce8c030410d9" - integrity sha512-vhwf7J98/YbHLf8GykvmF7Ok8QGjzR5BTb5VHpZ22jTdEIPPv0dTvwkQJrcyGg4DHGOVECFL+FOTud89JWtYEQ== +"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.5.tgz#4aefd88adab0377d9fb25c2f41c7a30ce96e3655" + integrity sha512-/9kYE1Rq51kXGxA2Et+br4xV3WsXA9Z2AA/wEU16pxbOwu0biBOffZbLWhfqKoi//JVxZJuxm8sjrA4E7hpjcg== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.4.tgz#f2b10c654d057100efb9919d0c5ba56f6c73f719" - integrity sha512-EUmJVN4eb6q7+gn5ze+f+wftp4jRzBojUU/2IjfHq9BmpqMewGO4OS3gfvomXEnx5z3cNci8cOT9is5IQ8jpfw== +"@abp/moment@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.5.tgz#5bbc6fa78f9667253568e68936b6c8edea74d319" + integrity sha512-v46BvWM6pWLswUeYhYM+sw3UeC6k+y2a49czY1gsW/ydrj8O61pbxulzPW3CLeqN+10qq4S7tJr3lK/o0Igq7A== dependencies: moment "^2.9.0" -"@abp/prismjs@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-7.4.0-rc.4.tgz#e267cbfa5276bbe1b51de8f67df0ce9c1443ba63" - integrity sha512-PHFc5TtIHY51Idd+wmhG41IV8QSpeF1E4o+w9eMJInEA47pIzlaH0nNqbuoBQQsrlVhzTFJ2rACZw4z76eaxNw== +"@abp/prismjs@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-7.4.0-rc.5.tgz#9480d0907fa0a15ab55aa95c460b4fa2507acd65" + integrity sha512-Q7t/vZDcI4qMSuf1Ytp01vvyCa4M+yC8e7lQf5EG9lFsBUDVUhuv5vtRthsTbbCfoDJl4LrJ/BfWGpWvftG3aA== dependencies: - "@abp/clipboard" "~7.4.0-rc.4" - "@abp/core" "~7.4.0-rc.4" + "@abp/clipboard" "~7.4.0-rc.5" + "@abp/core" "~7.4.0-rc.5" prismjs "^1.26.0" -"@abp/select2@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.4.tgz#07a1336943af96434cb76b5178bd8344f09e5e25" - integrity sha512-yN4fq+a27zYMsOb5xGJHRxO/GM/ZiPPOK2VryB7dy8bLC/jlMWPiFIRQDR6HY7BMPVHTds4zIhJeH2kWP/vgdA== +"@abp/select2@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.5.tgz#7fa5d7bc578e5a13f1cb77eb3885fd10bc987356" + integrity sha512-czk5o1Ogd8l+qolisQ6jDdqOCIsl129pI0DQsWwn5f/FGyLAkzZ8CQt8mx04PE6R4mNLLFwcMspPuTyxONLwyg== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" select2 "^4.0.13" -"@abp/sweetalert2@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.4.tgz#9588a8b89850459ee78c1c1f4bd890ebe8a319f4" - integrity sha512-rJLtDiG8kmpcwPxTTdNlVeto53DeuE80O3j7x4A/qBGNo9bfL+g83nwwR8Y+GnT0pLaNB3132rUMBbfSPsSgOA== +"@abp/sweetalert2@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.5.tgz#8c05235d32460e0f590841fd5fddb66a5ec664ed" + integrity sha512-uQ4qKj4szRBv1AU06U7F6z8iRGJTAs0yrJZuAt287sz1uZTXWhlN9nvfIiG/1Z8VCNHHDp12oPyVZzKOM3PhbQ== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" sweetalert2 "^11.3.6" -"@abp/timeago@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.4.tgz#a1ebcb037d5593439af42c87772f65e414faf6c3" - integrity sha512-BYwRqozV187taz67LCX3PcbwL8WyqiQgOYDnS5m+HnfjngzgWcOvGQqG3eskI057xu04ZyjMUIhaIJpGT3QDsw== +"@abp/timeago@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.5.tgz#02dfa7b5d59e71e45a9d48595a242dc5f25f4e21" + integrity sha512-EA+pSCSSGYtYaQABfhYWsMoVqgVGz8Ykn6a7tVc34Z5qfPKucgGKfuppRmQOZVz9n8zp9W/94BnDF2kRfP+FEg== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" timeago "^1.6.7" -"@abp/toastr@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.4.tgz#71327a6549a7744534cf20fb3efe94ddc844738f" - integrity sha512-KEpMqPO9s8dnqLJeeyarS10g1LaNv2JKVYu3tjlhlquh9u14+2haE/RHXl0/KEhbkvqxosSc1AwhIcZD8eWyew== +"@abp/toastr@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.5.tgz#ba2a623083c1182f1a66a21b932a02bb1665111b" + integrity sha512-BkJjWtbnPHImKL5g8Xwak2y7XdGk62q2bYZ/vFtSUY033Lr/3ufQxlVX6pXumodhPIrus7xEyIerxLWg8tYyAQ== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" toastr "^2.1.4" -"@abp/utils@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.4.tgz#5f60a548e5cf15dadb9ab25a406ba26a323fff20" - integrity sha512-UEp+u6kMLbqn3lrB0lI0b59s9+mhWckH1Hmo5Lv+Pam9d8FFGYhxho3UyCWVN+oWj/6W/SXw8XzgQBv490APHA== +"@abp/utils@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.5.tgz#f52cde2297a2b33562ee291541ec66f2080eafbd" + integrity sha512-9kPPKaA5vUVUYArblfaIurAaWxeaOfM/Sc9yzDmNWOTQ7FSBhCEKeZbQvj1X+mNpOV4rxEvqZ19LbvJ6RZs+AA== dependencies: just-compare "^2.3.0" diff --git a/modules/blogging/app/Volo.BloggingTestApp/package.json b/modules/blogging/app/Volo.BloggingTestApp/package.json index 364d7aebdb..17d9a40604 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/package.json +++ b/modules/blogging/app/Volo.BloggingTestApp/package.json @@ -3,7 +3,7 @@ "name": "volo.blogtestapp", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.4", - "@abp/blogging": "~7.4.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.5", + "@abp/blogging": "~7.4.0-rc.5" } } diff --git a/modules/blogging/app/Volo.BloggingTestApp/yarn.lock b/modules/blogging/app/Volo.BloggingTestApp/yarn.lock index 5766c65f11..f1aa1495cd 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/yarn.lock +++ b/modules/blogging/app/Volo.BloggingTestApp/yarn.lock @@ -2,39 +2,39 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.4.tgz#4b53752513bf727b4962093d8ff4daac66139718" - integrity sha512-Jj3faRxJdaaoJzPcyhJgb7/8+7oEK6rRY4R3uP5pF50khR/yNHWcLP6WCZ+LQZu7fKlEpiQ5EITiWRpP/5hf/w== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.4" - -"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.4.tgz#9f8b6c33c17da1c0bc0c596ef2fb9fe93248c7fb" - integrity sha512-lL6WWRSsrDIGBQl3tNFifLt08JEQycCrK0E57F3NquviFY/erducHp+dfJJ+s1OAadUlkvmsB5Scs8xQMQCaig== - dependencies: - "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.4" - "@abp/bootstrap" "~7.4.0-rc.4" - "@abp/bootstrap-datepicker" "~7.4.0-rc.4" - "@abp/bootstrap-daterangepicker" "~7.4.0-rc.4" - "@abp/datatables.net-bs5" "~7.4.0-rc.4" - "@abp/font-awesome" "~7.4.0-rc.4" - "@abp/jquery-form" "~7.4.0-rc.4" - "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.4" - "@abp/lodash" "~7.4.0-rc.4" - "@abp/luxon" "~7.4.0-rc.4" - "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.4" - "@abp/moment" "~7.4.0-rc.4" - "@abp/select2" "~7.4.0-rc.4" - "@abp/sweetalert2" "~7.4.0-rc.4" - "@abp/timeago" "~7.4.0-rc.4" - "@abp/toastr" "~7.4.0-rc.4" - -"@abp/aspnetcore.mvc.ui@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.4.tgz#3854183dea1a24dee42debc0a5413de0f08d3d0d" - integrity sha512-TTAnlbh8KcDWakMCtawHgrbcmoqvLdLxz1DDWUTkmCEQPImdrh52Jf1LNrL/771hug1dk5kqAuH5R5nBFGfnbA== +"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.5.tgz#20fb27493a42a88adf423862f79031a840fb741e" + integrity sha512-1pjQT+JWd+5Cqfzvt1CGii8Igd2YVpMd5vRYXkogKdjtJiElgaJwIbhjGMnV/neaSF2eR6y5g1SW6BP6NNN8yA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.5" + +"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.5.tgz#ebf4732a466ea187afb870571aea2862e278906a" + integrity sha512-EOtOHV9yEHX8dL0tSDTDQYXDVsNIuItDb5TpF30Jg8JIkz2xGnijXh71BmVb2QF7mZ2Q048BhAPc3s0i9cWU0g== + dependencies: + "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.5" + "@abp/bootstrap" "~7.4.0-rc.5" + "@abp/bootstrap-datepicker" "~7.4.0-rc.5" + "@abp/bootstrap-daterangepicker" "~7.4.0-rc.5" + "@abp/datatables.net-bs5" "~7.4.0-rc.5" + "@abp/font-awesome" "~7.4.0-rc.5" + "@abp/jquery-form" "~7.4.0-rc.5" + "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.5" + "@abp/lodash" "~7.4.0-rc.5" + "@abp/luxon" "~7.4.0-rc.5" + "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.5" + "@abp/moment" "~7.4.0-rc.5" + "@abp/select2" "~7.4.0-rc.5" + "@abp/sweetalert2" "~7.4.0-rc.5" + "@abp/timeago" "~7.4.0-rc.5" + "@abp/toastr" "~7.4.0-rc.5" + +"@abp/aspnetcore.mvc.ui@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.5.tgz#a71ff2736472b8028e09a6de1e998c9523c00f81" + integrity sha512-meoBTIfJ88Fp9HZKRTn9URXSMGGUioRIFr206VVE2pwOqO5lLKTbRkpeSM46uzLNoWRj+Rn4NDKdYdEsjWj1IQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,201 +43,201 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/blogging@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-7.4.0-rc.4.tgz#8cb5b4ca9bc8f8b8b69114564bf81c347c301e4e" - integrity sha512-Mw72jLEIpvuOR10Z6HS+xjwueRykUghM+aaaDVNmK3NT91Q9RMpouv77Ymb21K3yVZBhJ/3a6pbGuBBvv9zhMQ== +"@abp/blogging@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-7.4.0-rc.5.tgz#139e008ffd372b829e3c242401b6d1619ddfa392" + integrity sha512-dBvaI0N23rCqeYW6+mcCw5HWwPMFl/nT0Hi64vIEWWBiaevC+7pA7GEt73ohjR0w7mG7/qH1WiAuGLEQ808oFw== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.4" - "@abp/owl.carousel" "~7.4.0-rc.4" - "@abp/prismjs" "~7.4.0-rc.4" - "@abp/tui-editor" "~7.4.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.5" + "@abp/owl.carousel" "~7.4.0-rc.5" + "@abp/prismjs" "~7.4.0-rc.5" + "@abp/tui-editor" "~7.4.0-rc.5" -"@abp/bootstrap-datepicker@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.4.tgz#2fe2c68d628383d1d8ff349dfb7da9b5b4eb04c1" - integrity sha512-C+vLaehe6lZhLPuJM5ZfwsHOqt3htOVpyjZvBwyX3DdXIwsLpg7nCvTPgtXbt1CNSJ3aePkbdQDEaLv603WRGw== +"@abp/bootstrap-datepicker@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.5.tgz#943ef8fb6bc984788f08a828a187495bc8fc3be8" + integrity sha512-bhBiHDichxIsqN8FyeFkViOyGnQyLs9RG+ZIRnM7l9zP+8m7InB+RFbRCi7IRLnNVoT9C+Fy5O9kOhTyd48dkg== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.4.tgz#d8b950f91d5963ef7725f2bc69b80c24b3626235" - integrity sha512-ehoqkI07UGc/MbhENOV7BkB67VNyRa8lYC9gBBlD+59VAsg1f3b/UzVJGnTvcPPPwA4SyJL56dDZbxj8uI1TAQ== +"@abp/bootstrap-daterangepicker@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.5.tgz#052393e99a181fe48814a86b3adb47e302ef1d50" + integrity sha512-N4gBrfOA9Jl9qcDo8EAgGI1SZHnQb7bFcAdW2rQlRhCYuhd89wR3RWqsljh+UwEBqu/LPzYMGTQ+TLdLHi2rug== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.4.tgz#794850366d0a85a6e2ad703590ad91f5616d50ad" - integrity sha512-+tcO/o1hnpiI8HPjnh5BGZn7NbVnQsKAgR5nJkZvHlVdsiFnufgtVfKoM0n7lalN/h0caCLbBxkS+OVrpTCv6Q== +"@abp/bootstrap@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.5.tgz#5718af8004ac3dc00c451cab07a4260ca0e45ac5" + integrity sha512-FAB+yeKXn+P0YuuzFYrBUAQSEIoIm7FSwxb13ouCRb17XgHXcSp2ikdPIMcctGnq/Af31WxfJjCWGLNVcZCCmw== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" bootstrap "^5.1.3" -"@abp/clipboard@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-7.4.0-rc.4.tgz#555f72dab99343520784cbb1cb3c6c50086500c0" - integrity sha512-p4Px63x5VaS7buwg/0TU26LIZ+LPAQOBAvlHWXl8QhvpdN5OjZPX+GyvEW4UkzcNbyoB7bn9bBUYRD1cDSmlzQ== +"@abp/clipboard@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-7.4.0-rc.5.tgz#54ca41b3284552a6595fda51caf12d715d3f64f5" + integrity sha512-1+XKIOPM77msa+xfWsFFZzLc450q2vq3/dDKSkFqKxj4PfnM5jqijoptG0k0EcBojOfTURESwREE1Xqjn3OjHg== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" clipboard "^2.0.8" -"@abp/core@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.4.tgz#4a2aebc67fdd1f9296d34c33cba7d3b5d5b186d6" - integrity sha512-nBEks/7mCqYEhvKZtda6bi56eh0hiVym+/VCe9D9YXSVuFAoudmN1KyBL1/HLrJOFYCenP8TQMXDxXg9Qv4ILQ== +"@abp/core@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.5.tgz#93eb68ac9828c4ce66355e651f194fcc5e171bf3" + integrity sha512-2oqRviXbS1Avuj63u/s8AjnLEuR4FvG+hpk81DA39hNiNPvwosG24Ie9nxaa0A5F7kcCEvRM7JAmc/0MQ7FJKg== dependencies: - "@abp/utils" "~7.4.0-rc.4" + "@abp/utils" "~7.4.0-rc.5" -"@abp/datatables.net-bs5@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.4.tgz#cc205cdee4d24e9b9059797443cb52996f42b431" - integrity sha512-DnKtYe9LgYfRAATQRlbs90jDH4KM6jbYIcXht/CibU8c/hGWXver/wk+13w4lMlzm+eDw/yJ1qNKfFTYMCXaBw== +"@abp/datatables.net-bs5@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.5.tgz#036e98a69c7bb51f56755b93912c00841ffc6e00" + integrity sha512-OZlNJynMFus4AxPMoCAfIE15X3PdGB5UwKJTi7XCza4Ok3F+mevmsIwOpjLqs1OpbLEIHK3Ftk6nXfTMpFZQpQ== dependencies: - "@abp/datatables.net" "~7.4.0-rc.4" + "@abp/datatables.net" "~7.4.0-rc.5" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.4.tgz#eb9458cd0f0c1f1de9321bb2e637357e67ac68d9" - integrity sha512-OipmXFl4b//5agl+zIhhDT9tpt/QLcd6Ux+Ual8Wavh2YuGU7KDgCBWPN9W9McCfyExtejjp1H0epk6rl/EMXg== +"@abp/datatables.net@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.5.tgz#32fa40f3a1f397faf06b25e3653cdfb74256a2e5" + integrity sha512-grRRJfrDZz4v8t0QP1/bXlDNcZpWdcxLI4MsHORekt9EXrWx2iWtcZt4yhs7GLhX2swc6VuNf3OCO8/S5obQpQ== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" datatables.net "^1.11.4" -"@abp/font-awesome@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.4.tgz#720c32147bc5590b52911121a01a5f951ca09092" - integrity sha512-6gmsa42ernWVU8jfUl+ZpoSnSbr9Gc8nhl+cMKwo7AkbPvtMhR/tnH0v+4/0wJl+SWelvXeTWL7OHi3ZmFsNgA== +"@abp/font-awesome@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.5.tgz#1171b3556eac71894083bfe0776dd170783d8f17" + integrity sha512-UUJZ2Q7pYag4j6C83ElV7z3eG72HthpJW/RQ4/rMjoeW5Dbduomuihx0WtDqtoNmsYdjH7Z0nWUhKzRUv3Yo9Q== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.4.tgz#669f9adda562867e8db075718577c8fe0222f979" - integrity sha512-MOqz5rIL3gZaABvGI5veMDZOl/8O+i5uJagmLpvjY9rau8tygJQ7t7pYHQEMlfQchNRb/m7p5WSgmvZ/R80BKw== +"@abp/jquery-form@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.5.tgz#a3a66b333c839f36af88808cf4588162fdf8237f" + integrity sha512-PotRlDmzxnG6zk8yAJCR6MthK5tWH6disgWPsCxl+UN6d470V24ei0ZWx/eN2YKxRnRYLrrdvbgH9OMM7Clq9g== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.4.tgz#7092b57d7362a4e201f82c41f4ef38edc50acf95" - integrity sha512-DUvT1jMt4YwML3oTXA369NaQGWVR2nDDf0J6RfHjzT1geSzJiquYN2PAZ7u/tPqQgbS62+HIvI+zbWZ1rNJ6XA== +"@abp/jquery-validation-unobtrusive@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.5.tgz#7796c2bb644ebdff18e2c74822570a710d0d863e" + integrity sha512-6YWYUfPfjf1fZIEWHR9wqzJuWI1hmrGnm9uILZ9o829pvqdC7ctqemv2+PwSYPDzTcmk5ys54NHcXcwq8/H/JA== dependencies: - "@abp/jquery-validation" "~7.4.0-rc.4" + "@abp/jquery-validation" "~7.4.0-rc.5" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.4.tgz#b74f2d0138b7caf46c0085e57fcdba92a917f55a" - integrity sha512-qaYmHUr6/d13LSXHII8XIE1MuVbBPswToKN7y0uw3joFcw7NyQCEOkAkTxpGy0V6uhP/4zbxs90SYkJfy60zww== +"@abp/jquery-validation@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.5.tgz#e27d2936d6dc0fb9182f1cf1f73019b2e1873b87" + integrity sha512-O1RSRI1UH8ZTMBTfkQG+LSvE+4W5W93Rw0bUJV8dI5lWT9cBuoQkWVLqOZqr9JX9ZMuYMf4GDyWYYT5MS4+EQQ== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" jquery-validation "^1.19.3" -"@abp/jquery@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.4.tgz#615c4a40b451cd526085a69335bc6f41ebe99223" - integrity sha512-fuU5bt4x2NBeJXOCEyfeDPo8UiVoKqgjuKvXLoiAvt+za5qGitRQuPbJAakDKVxGWa7idu/d/8oYLWEqWw3Luw== +"@abp/jquery@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.5.tgz#fb664d1706e2ff02f24bf910363ff8221a447b7c" + integrity sha512-o/bTJKO7g9H0NChDtgYanG049Zihmojlt86fNfJ5p0uCRAbkrLnUQfOqTw5NhtQAbPmNyR+pK6Tk9oKlN6/V0Q== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" jquery "~3.6.0" -"@abp/lodash@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.4.tgz#0c94552b4debf025afdfe636cca753169dbcba85" - integrity sha512-oWrSBwDRb7EfvnHiPYSLzIuwZ6rvm4j6yjtxIe1rQt4X9aWENVXUPtg6ZG59kpZGEAFcIC5xJcTNfkLui7Xorw== +"@abp/lodash@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.5.tgz#68123983a07f334230692a2a9750b0f3a9681000" + integrity sha512-MleBwBDXCg4pLyQVAU94/j5wPFhsZ3GU8UlBokhS8QXu4J444GyBH6DCes9VPFvAcKe0WJzCNe2wPn9GU2bmiA== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" lodash "^4.17.21" -"@abp/luxon@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.4.tgz#6c6247b5672bfd49ef64a3a3ea94aa74eeeeaae8" - integrity sha512-B2QYSAP8UInRoMEo+X9499s1VVDpjIbojTIqENufouGUqdRlDN+0ZJYHKmliQloQ1HZdGHOs0z8kFA4at+bsgQ== +"@abp/luxon@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.5.tgz#2a5ba7a7d43d35b8ed7e839b85518e26afe21890" + integrity sha512-E5PsSaLRwziJsi0OVBokZ7n1SCzBBQv25P9bc29aC0t8rjHNpkmhR7zHDF3XgUQSTiBWy35l69l+ZD9AEhm9ZA== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.4.tgz#7aacc70573587058a49f9d464c8fce8c030410d9" - integrity sha512-vhwf7J98/YbHLf8GykvmF7Ok8QGjzR5BTb5VHpZ22jTdEIPPv0dTvwkQJrcyGg4DHGOVECFL+FOTud89JWtYEQ== +"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.5.tgz#4aefd88adab0377d9fb25c2f41c7a30ce96e3655" + integrity sha512-/9kYE1Rq51kXGxA2Et+br4xV3WsXA9Z2AA/wEU16pxbOwu0biBOffZbLWhfqKoi//JVxZJuxm8sjrA4E7hpjcg== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.4.tgz#f2b10c654d057100efb9919d0c5ba56f6c73f719" - integrity sha512-EUmJVN4eb6q7+gn5ze+f+wftp4jRzBojUU/2IjfHq9BmpqMewGO4OS3gfvomXEnx5z3cNci8cOT9is5IQ8jpfw== +"@abp/moment@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.5.tgz#5bbc6fa78f9667253568e68936b6c8edea74d319" + integrity sha512-v46BvWM6pWLswUeYhYM+sw3UeC6k+y2a49czY1gsW/ydrj8O61pbxulzPW3CLeqN+10qq4S7tJr3lK/o0Igq7A== dependencies: moment "^2.9.0" -"@abp/owl.carousel@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-7.4.0-rc.4.tgz#866d0c07fa1aee33b81a3a46371b38e6cdb72e1c" - integrity sha512-K2jEqY9LucQYMQG5dUnMQ9cdzNEMmDA9cOyI9+wrunh05ov/WhtmdjaHfBeH4u0qCHjIn3TgrRgdZ/JP2TxWzA== +"@abp/owl.carousel@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-7.4.0-rc.5.tgz#8d0822527691c1d38868c62c8e8b11784be3a8ad" + integrity sha512-xdYFASooFK94tDuOlW2JWU+5Vp1XhT0irz411StNiOZ93K0dcu7INs0NLbc7AjGUZeX+bNZEZMWLoEk0qK7wIA== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" owl.carousel "^2.3.4" -"@abp/prismjs@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-7.4.0-rc.4.tgz#e267cbfa5276bbe1b51de8f67df0ce9c1443ba63" - integrity sha512-PHFc5TtIHY51Idd+wmhG41IV8QSpeF1E4o+w9eMJInEA47pIzlaH0nNqbuoBQQsrlVhzTFJ2rACZw4z76eaxNw== +"@abp/prismjs@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-7.4.0-rc.5.tgz#9480d0907fa0a15ab55aa95c460b4fa2507acd65" + integrity sha512-Q7t/vZDcI4qMSuf1Ytp01vvyCa4M+yC8e7lQf5EG9lFsBUDVUhuv5vtRthsTbbCfoDJl4LrJ/BfWGpWvftG3aA== dependencies: - "@abp/clipboard" "~7.4.0-rc.4" - "@abp/core" "~7.4.0-rc.4" + "@abp/clipboard" "~7.4.0-rc.5" + "@abp/core" "~7.4.0-rc.5" prismjs "^1.26.0" -"@abp/select2@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.4.tgz#07a1336943af96434cb76b5178bd8344f09e5e25" - integrity sha512-yN4fq+a27zYMsOb5xGJHRxO/GM/ZiPPOK2VryB7dy8bLC/jlMWPiFIRQDR6HY7BMPVHTds4zIhJeH2kWP/vgdA== +"@abp/select2@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.5.tgz#7fa5d7bc578e5a13f1cb77eb3885fd10bc987356" + integrity sha512-czk5o1Ogd8l+qolisQ6jDdqOCIsl129pI0DQsWwn5f/FGyLAkzZ8CQt8mx04PE6R4mNLLFwcMspPuTyxONLwyg== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" select2 "^4.0.13" -"@abp/sweetalert2@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.4.tgz#9588a8b89850459ee78c1c1f4bd890ebe8a319f4" - integrity sha512-rJLtDiG8kmpcwPxTTdNlVeto53DeuE80O3j7x4A/qBGNo9bfL+g83nwwR8Y+GnT0pLaNB3132rUMBbfSPsSgOA== +"@abp/sweetalert2@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.5.tgz#8c05235d32460e0f590841fd5fddb66a5ec664ed" + integrity sha512-uQ4qKj4szRBv1AU06U7F6z8iRGJTAs0yrJZuAt287sz1uZTXWhlN9nvfIiG/1Z8VCNHHDp12oPyVZzKOM3PhbQ== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" sweetalert2 "^11.3.6" -"@abp/timeago@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.4.tgz#a1ebcb037d5593439af42c87772f65e414faf6c3" - integrity sha512-BYwRqozV187taz67LCX3PcbwL8WyqiQgOYDnS5m+HnfjngzgWcOvGQqG3eskI057xu04ZyjMUIhaIJpGT3QDsw== +"@abp/timeago@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.5.tgz#02dfa7b5d59e71e45a9d48595a242dc5f25f4e21" + integrity sha512-EA+pSCSSGYtYaQABfhYWsMoVqgVGz8Ykn6a7tVc34Z5qfPKucgGKfuppRmQOZVz9n8zp9W/94BnDF2kRfP+FEg== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" timeago "^1.6.7" -"@abp/toastr@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.4.tgz#71327a6549a7744534cf20fb3efe94ddc844738f" - integrity sha512-KEpMqPO9s8dnqLJeeyarS10g1LaNv2JKVYu3tjlhlquh9u14+2haE/RHXl0/KEhbkvqxosSc1AwhIcZD8eWyew== +"@abp/toastr@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.5.tgz#ba2a623083c1182f1a66a21b932a02bb1665111b" + integrity sha512-BkJjWtbnPHImKL5g8Xwak2y7XdGk62q2bYZ/vFtSUY033Lr/3ufQxlVX6pXumodhPIrus7xEyIerxLWg8tYyAQ== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" toastr "^2.1.4" -"@abp/tui-editor@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-7.4.0-rc.4.tgz#830e429aebd2f819a3f30a2dbe9384c8c7e058c5" - integrity sha512-opZEMuuCGxwmu0QuzfTZhJ8FlSH+e0z0q5lbo1ywu18w270c3xLY0qGfDEjyCRq+VahHi079k4BMKGwzBvzLow== +"@abp/tui-editor@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-7.4.0-rc.5.tgz#95bf2993c0bdc41de4737d6b9edb94fccccb595b" + integrity sha512-NySXrbAaA4ddgiGyYLbaTXlG0/oXm99+nJpCiLUPJNA5I+WzhUFx4X1FIsfP/80A8jiodHpKrt4DhqhVW4+ZJA== dependencies: - "@abp/jquery" "~7.4.0-rc.4" - "@abp/prismjs" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" + "@abp/prismjs" "~7.4.0-rc.5" -"@abp/utils@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.4.tgz#5f60a548e5cf15dadb9ab25a406ba26a323fff20" - integrity sha512-UEp+u6kMLbqn3lrB0lI0b59s9+mhWckH1Hmo5Lv+Pam9d8FFGYhxho3UyCWVN+oWj/6W/SXw8XzgQBv490APHA== +"@abp/utils@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.5.tgz#f52cde2297a2b33562ee291541ec66f2080eafbd" + integrity sha512-9kPPKaA5vUVUYArblfaIurAaWxeaOfM/Sc9yzDmNWOTQ7FSBhCEKeZbQvj1X+mNpOV4rxEvqZ19LbvJ6RZs+AA== dependencies: just-compare "^2.3.0" diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json index 3f6d55475c..4c7d2277d8 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json @@ -3,6 +3,6 @@ "name": "client-simulation-web", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.5" } } diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock index 739bb79d1c..8e55b67a23 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock @@ -2,39 +2,39 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.4.tgz#4b53752513bf727b4962093d8ff4daac66139718" - integrity sha512-Jj3faRxJdaaoJzPcyhJgb7/8+7oEK6rRY4R3uP5pF50khR/yNHWcLP6WCZ+LQZu7fKlEpiQ5EITiWRpP/5hf/w== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.4" - -"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.4.tgz#9f8b6c33c17da1c0bc0c596ef2fb9fe93248c7fb" - integrity sha512-lL6WWRSsrDIGBQl3tNFifLt08JEQycCrK0E57F3NquviFY/erducHp+dfJJ+s1OAadUlkvmsB5Scs8xQMQCaig== - dependencies: - "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.4" - "@abp/bootstrap" "~7.4.0-rc.4" - "@abp/bootstrap-datepicker" "~7.4.0-rc.4" - "@abp/bootstrap-daterangepicker" "~7.4.0-rc.4" - "@abp/datatables.net-bs5" "~7.4.0-rc.4" - "@abp/font-awesome" "~7.4.0-rc.4" - "@abp/jquery-form" "~7.4.0-rc.4" - "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.4" - "@abp/lodash" "~7.4.0-rc.4" - "@abp/luxon" "~7.4.0-rc.4" - "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.4" - "@abp/moment" "~7.4.0-rc.4" - "@abp/select2" "~7.4.0-rc.4" - "@abp/sweetalert2" "~7.4.0-rc.4" - "@abp/timeago" "~7.4.0-rc.4" - "@abp/toastr" "~7.4.0-rc.4" - -"@abp/aspnetcore.mvc.ui@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.4.tgz#3854183dea1a24dee42debc0a5413de0f08d3d0d" - integrity sha512-TTAnlbh8KcDWakMCtawHgrbcmoqvLdLxz1DDWUTkmCEQPImdrh52Jf1LNrL/771hug1dk5kqAuH5R5nBFGfnbA== +"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.5.tgz#20fb27493a42a88adf423862f79031a840fb741e" + integrity sha512-1pjQT+JWd+5Cqfzvt1CGii8Igd2YVpMd5vRYXkogKdjtJiElgaJwIbhjGMnV/neaSF2eR6y5g1SW6BP6NNN8yA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.5" + +"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.5.tgz#ebf4732a466ea187afb870571aea2862e278906a" + integrity sha512-EOtOHV9yEHX8dL0tSDTDQYXDVsNIuItDb5TpF30Jg8JIkz2xGnijXh71BmVb2QF7mZ2Q048BhAPc3s0i9cWU0g== + dependencies: + "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.5" + "@abp/bootstrap" "~7.4.0-rc.5" + "@abp/bootstrap-datepicker" "~7.4.0-rc.5" + "@abp/bootstrap-daterangepicker" "~7.4.0-rc.5" + "@abp/datatables.net-bs5" "~7.4.0-rc.5" + "@abp/font-awesome" "~7.4.0-rc.5" + "@abp/jquery-form" "~7.4.0-rc.5" + "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.5" + "@abp/lodash" "~7.4.0-rc.5" + "@abp/luxon" "~7.4.0-rc.5" + "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.5" + "@abp/moment" "~7.4.0-rc.5" + "@abp/select2" "~7.4.0-rc.5" + "@abp/sweetalert2" "~7.4.0-rc.5" + "@abp/timeago" "~7.4.0-rc.5" + "@abp/toastr" "~7.4.0-rc.5" + +"@abp/aspnetcore.mvc.ui@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.5.tgz#a71ff2736472b8028e09a6de1e998c9523c00f81" + integrity sha512-meoBTIfJ88Fp9HZKRTn9URXSMGGUioRIFr206VVE2pwOqO5lLKTbRkpeSM46uzLNoWRj+Rn4NDKdYdEsjWj1IQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,158 +43,158 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.4.tgz#2fe2c68d628383d1d8ff349dfb7da9b5b4eb04c1" - integrity sha512-C+vLaehe6lZhLPuJM5ZfwsHOqt3htOVpyjZvBwyX3DdXIwsLpg7nCvTPgtXbt1CNSJ3aePkbdQDEaLv603WRGw== +"@abp/bootstrap-datepicker@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.5.tgz#943ef8fb6bc984788f08a828a187495bc8fc3be8" + integrity sha512-bhBiHDichxIsqN8FyeFkViOyGnQyLs9RG+ZIRnM7l9zP+8m7InB+RFbRCi7IRLnNVoT9C+Fy5O9kOhTyd48dkg== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.4.tgz#d8b950f91d5963ef7725f2bc69b80c24b3626235" - integrity sha512-ehoqkI07UGc/MbhENOV7BkB67VNyRa8lYC9gBBlD+59VAsg1f3b/UzVJGnTvcPPPwA4SyJL56dDZbxj8uI1TAQ== +"@abp/bootstrap-daterangepicker@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.5.tgz#052393e99a181fe48814a86b3adb47e302ef1d50" + integrity sha512-N4gBrfOA9Jl9qcDo8EAgGI1SZHnQb7bFcAdW2rQlRhCYuhd89wR3RWqsljh+UwEBqu/LPzYMGTQ+TLdLHi2rug== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.4.tgz#794850366d0a85a6e2ad703590ad91f5616d50ad" - integrity sha512-+tcO/o1hnpiI8HPjnh5BGZn7NbVnQsKAgR5nJkZvHlVdsiFnufgtVfKoM0n7lalN/h0caCLbBxkS+OVrpTCv6Q== +"@abp/bootstrap@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.5.tgz#5718af8004ac3dc00c451cab07a4260ca0e45ac5" + integrity sha512-FAB+yeKXn+P0YuuzFYrBUAQSEIoIm7FSwxb13ouCRb17XgHXcSp2ikdPIMcctGnq/Af31WxfJjCWGLNVcZCCmw== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" bootstrap "^5.1.3" -"@abp/core@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.4.tgz#4a2aebc67fdd1f9296d34c33cba7d3b5d5b186d6" - integrity sha512-nBEks/7mCqYEhvKZtda6bi56eh0hiVym+/VCe9D9YXSVuFAoudmN1KyBL1/HLrJOFYCenP8TQMXDxXg9Qv4ILQ== +"@abp/core@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.5.tgz#93eb68ac9828c4ce66355e651f194fcc5e171bf3" + integrity sha512-2oqRviXbS1Avuj63u/s8AjnLEuR4FvG+hpk81DA39hNiNPvwosG24Ie9nxaa0A5F7kcCEvRM7JAmc/0MQ7FJKg== dependencies: - "@abp/utils" "~7.4.0-rc.4" + "@abp/utils" "~7.4.0-rc.5" -"@abp/datatables.net-bs5@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.4.tgz#cc205cdee4d24e9b9059797443cb52996f42b431" - integrity sha512-DnKtYe9LgYfRAATQRlbs90jDH4KM6jbYIcXht/CibU8c/hGWXver/wk+13w4lMlzm+eDw/yJ1qNKfFTYMCXaBw== +"@abp/datatables.net-bs5@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.5.tgz#036e98a69c7bb51f56755b93912c00841ffc6e00" + integrity sha512-OZlNJynMFus4AxPMoCAfIE15X3PdGB5UwKJTi7XCza4Ok3F+mevmsIwOpjLqs1OpbLEIHK3Ftk6nXfTMpFZQpQ== dependencies: - "@abp/datatables.net" "~7.4.0-rc.4" + "@abp/datatables.net" "~7.4.0-rc.5" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.4.tgz#eb9458cd0f0c1f1de9321bb2e637357e67ac68d9" - integrity sha512-OipmXFl4b//5agl+zIhhDT9tpt/QLcd6Ux+Ual8Wavh2YuGU7KDgCBWPN9W9McCfyExtejjp1H0epk6rl/EMXg== +"@abp/datatables.net@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.5.tgz#32fa40f3a1f397faf06b25e3653cdfb74256a2e5" + integrity sha512-grRRJfrDZz4v8t0QP1/bXlDNcZpWdcxLI4MsHORekt9EXrWx2iWtcZt4yhs7GLhX2swc6VuNf3OCO8/S5obQpQ== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" datatables.net "^1.11.4" -"@abp/font-awesome@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.4.tgz#720c32147bc5590b52911121a01a5f951ca09092" - integrity sha512-6gmsa42ernWVU8jfUl+ZpoSnSbr9Gc8nhl+cMKwo7AkbPvtMhR/tnH0v+4/0wJl+SWelvXeTWL7OHi3ZmFsNgA== +"@abp/font-awesome@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.5.tgz#1171b3556eac71894083bfe0776dd170783d8f17" + integrity sha512-UUJZ2Q7pYag4j6C83ElV7z3eG72HthpJW/RQ4/rMjoeW5Dbduomuihx0WtDqtoNmsYdjH7Z0nWUhKzRUv3Yo9Q== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.4.tgz#669f9adda562867e8db075718577c8fe0222f979" - integrity sha512-MOqz5rIL3gZaABvGI5veMDZOl/8O+i5uJagmLpvjY9rau8tygJQ7t7pYHQEMlfQchNRb/m7p5WSgmvZ/R80BKw== +"@abp/jquery-form@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.5.tgz#a3a66b333c839f36af88808cf4588162fdf8237f" + integrity sha512-PotRlDmzxnG6zk8yAJCR6MthK5tWH6disgWPsCxl+UN6d470V24ei0ZWx/eN2YKxRnRYLrrdvbgH9OMM7Clq9g== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.4.tgz#7092b57d7362a4e201f82c41f4ef38edc50acf95" - integrity sha512-DUvT1jMt4YwML3oTXA369NaQGWVR2nDDf0J6RfHjzT1geSzJiquYN2PAZ7u/tPqQgbS62+HIvI+zbWZ1rNJ6XA== +"@abp/jquery-validation-unobtrusive@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.5.tgz#7796c2bb644ebdff18e2c74822570a710d0d863e" + integrity sha512-6YWYUfPfjf1fZIEWHR9wqzJuWI1hmrGnm9uILZ9o829pvqdC7ctqemv2+PwSYPDzTcmk5ys54NHcXcwq8/H/JA== dependencies: - "@abp/jquery-validation" "~7.4.0-rc.4" + "@abp/jquery-validation" "~7.4.0-rc.5" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.4.tgz#b74f2d0138b7caf46c0085e57fcdba92a917f55a" - integrity sha512-qaYmHUr6/d13LSXHII8XIE1MuVbBPswToKN7y0uw3joFcw7NyQCEOkAkTxpGy0V6uhP/4zbxs90SYkJfy60zww== +"@abp/jquery-validation@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.5.tgz#e27d2936d6dc0fb9182f1cf1f73019b2e1873b87" + integrity sha512-O1RSRI1UH8ZTMBTfkQG+LSvE+4W5W93Rw0bUJV8dI5lWT9cBuoQkWVLqOZqr9JX9ZMuYMf4GDyWYYT5MS4+EQQ== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" jquery-validation "^1.19.3" -"@abp/jquery@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.4.tgz#615c4a40b451cd526085a69335bc6f41ebe99223" - integrity sha512-fuU5bt4x2NBeJXOCEyfeDPo8UiVoKqgjuKvXLoiAvt+za5qGitRQuPbJAakDKVxGWa7idu/d/8oYLWEqWw3Luw== +"@abp/jquery@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.5.tgz#fb664d1706e2ff02f24bf910363ff8221a447b7c" + integrity sha512-o/bTJKO7g9H0NChDtgYanG049Zihmojlt86fNfJ5p0uCRAbkrLnUQfOqTw5NhtQAbPmNyR+pK6Tk9oKlN6/V0Q== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" jquery "~3.6.0" -"@abp/lodash@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.4.tgz#0c94552b4debf025afdfe636cca753169dbcba85" - integrity sha512-oWrSBwDRb7EfvnHiPYSLzIuwZ6rvm4j6yjtxIe1rQt4X9aWENVXUPtg6ZG59kpZGEAFcIC5xJcTNfkLui7Xorw== +"@abp/lodash@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.5.tgz#68123983a07f334230692a2a9750b0f3a9681000" + integrity sha512-MleBwBDXCg4pLyQVAU94/j5wPFhsZ3GU8UlBokhS8QXu4J444GyBH6DCes9VPFvAcKe0WJzCNe2wPn9GU2bmiA== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" lodash "^4.17.21" -"@abp/luxon@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.4.tgz#6c6247b5672bfd49ef64a3a3ea94aa74eeeeaae8" - integrity sha512-B2QYSAP8UInRoMEo+X9499s1VVDpjIbojTIqENufouGUqdRlDN+0ZJYHKmliQloQ1HZdGHOs0z8kFA4at+bsgQ== +"@abp/luxon@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.5.tgz#2a5ba7a7d43d35b8ed7e839b85518e26afe21890" + integrity sha512-E5PsSaLRwziJsi0OVBokZ7n1SCzBBQv25P9bc29aC0t8rjHNpkmhR7zHDF3XgUQSTiBWy35l69l+ZD9AEhm9ZA== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.4.tgz#7aacc70573587058a49f9d464c8fce8c030410d9" - integrity sha512-vhwf7J98/YbHLf8GykvmF7Ok8QGjzR5BTb5VHpZ22jTdEIPPv0dTvwkQJrcyGg4DHGOVECFL+FOTud89JWtYEQ== +"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.5.tgz#4aefd88adab0377d9fb25c2f41c7a30ce96e3655" + integrity sha512-/9kYE1Rq51kXGxA2Et+br4xV3WsXA9Z2AA/wEU16pxbOwu0biBOffZbLWhfqKoi//JVxZJuxm8sjrA4E7hpjcg== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.4.tgz#f2b10c654d057100efb9919d0c5ba56f6c73f719" - integrity sha512-EUmJVN4eb6q7+gn5ze+f+wftp4jRzBojUU/2IjfHq9BmpqMewGO4OS3gfvomXEnx5z3cNci8cOT9is5IQ8jpfw== +"@abp/moment@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.5.tgz#5bbc6fa78f9667253568e68936b6c8edea74d319" + integrity sha512-v46BvWM6pWLswUeYhYM+sw3UeC6k+y2a49czY1gsW/ydrj8O61pbxulzPW3CLeqN+10qq4S7tJr3lK/o0Igq7A== dependencies: moment "^2.9.0" -"@abp/select2@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.4.tgz#07a1336943af96434cb76b5178bd8344f09e5e25" - integrity sha512-yN4fq+a27zYMsOb5xGJHRxO/GM/ZiPPOK2VryB7dy8bLC/jlMWPiFIRQDR6HY7BMPVHTds4zIhJeH2kWP/vgdA== +"@abp/select2@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.5.tgz#7fa5d7bc578e5a13f1cb77eb3885fd10bc987356" + integrity sha512-czk5o1Ogd8l+qolisQ6jDdqOCIsl129pI0DQsWwn5f/FGyLAkzZ8CQt8mx04PE6R4mNLLFwcMspPuTyxONLwyg== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" select2 "^4.0.13" -"@abp/sweetalert2@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.4.tgz#9588a8b89850459ee78c1c1f4bd890ebe8a319f4" - integrity sha512-rJLtDiG8kmpcwPxTTdNlVeto53DeuE80O3j7x4A/qBGNo9bfL+g83nwwR8Y+GnT0pLaNB3132rUMBbfSPsSgOA== +"@abp/sweetalert2@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.5.tgz#8c05235d32460e0f590841fd5fddb66a5ec664ed" + integrity sha512-uQ4qKj4szRBv1AU06U7F6z8iRGJTAs0yrJZuAt287sz1uZTXWhlN9nvfIiG/1Z8VCNHHDp12oPyVZzKOM3PhbQ== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" sweetalert2 "^11.3.6" -"@abp/timeago@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.4.tgz#a1ebcb037d5593439af42c87772f65e414faf6c3" - integrity sha512-BYwRqozV187taz67LCX3PcbwL8WyqiQgOYDnS5m+HnfjngzgWcOvGQqG3eskI057xu04ZyjMUIhaIJpGT3QDsw== +"@abp/timeago@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.5.tgz#02dfa7b5d59e71e45a9d48595a242dc5f25f4e21" + integrity sha512-EA+pSCSSGYtYaQABfhYWsMoVqgVGz8Ykn6a7tVc34Z5qfPKucgGKfuppRmQOZVz9n8zp9W/94BnDF2kRfP+FEg== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" timeago "^1.6.7" -"@abp/toastr@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.4.tgz#71327a6549a7744534cf20fb3efe94ddc844738f" - integrity sha512-KEpMqPO9s8dnqLJeeyarS10g1LaNv2JKVYu3tjlhlquh9u14+2haE/RHXl0/KEhbkvqxosSc1AwhIcZD8eWyew== +"@abp/toastr@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.5.tgz#ba2a623083c1182f1a66a21b932a02bb1665111b" + integrity sha512-BkJjWtbnPHImKL5g8Xwak2y7XdGk62q2bYZ/vFtSUY033Lr/3ufQxlVX6pXumodhPIrus7xEyIerxLWg8tYyAQ== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" toastr "^2.1.4" -"@abp/utils@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.4.tgz#5f60a548e5cf15dadb9ab25a406ba26a323fff20" - integrity sha512-UEp+u6kMLbqn3lrB0lI0b59s9+mhWckH1Hmo5Lv+Pam9d8FFGYhxho3UyCWVN+oWj/6W/SXw8XzgQBv490APHA== +"@abp/utils@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.5.tgz#f52cde2297a2b33562ee291541ec66f2080eafbd" + integrity sha512-9kPPKaA5vUVUYArblfaIurAaWxeaOfM/Sc9yzDmNWOTQ7FSBhCEKeZbQvj1X+mNpOV4rxEvqZ19LbvJ6RZs+AA== dependencies: just-compare "^2.3.0" diff --git a/modules/cms-kit/angular/package.json b/modules/cms-kit/angular/package.json index 20e1a3f475..cf5e3f3d02 100644 --- a/modules/cms-kit/angular/package.json +++ b/modules/cms-kit/angular/package.json @@ -15,11 +15,11 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~7.4.0-rc.4", - "@abp/ng.identity": "~7.4.0-rc.4", - "@abp/ng.setting-management": "~7.4.0-rc.4", - "@abp/ng.tenant-management": "~7.4.0-rc.4", - "@abp/ng.theme.basic": "~7.4.0-rc.4", + "@abp/ng.account": "~7.4.0-rc.5", + "@abp/ng.identity": "~7.4.0-rc.5", + "@abp/ng.setting-management": "~7.4.0-rc.5", + "@abp/ng.tenant-management": "~7.4.0-rc.5", + "@abp/ng.theme.basic": "~7.4.0-rc.5", "@angular/animations": "~10.0.0", "@angular/common": "~10.0.0", "@angular/compiler": "~10.0.0", diff --git a/modules/cms-kit/angular/projects/cms-kit/package.json b/modules/cms-kit/angular/projects/cms-kit/package.json index b1a182d024..bb9e88fc8b 100644 --- a/modules/cms-kit/angular/projects/cms-kit/package.json +++ b/modules/cms-kit/angular/projects/cms-kit/package.json @@ -4,8 +4,8 @@ "peerDependencies": { "@angular/common": "^9.1.11", "@angular/core": "^9.1.11", - "@abp/ng.core": ">=7.4.0-rc.4", - "@abp/ng.theme.shared": ">=7.4.0-rc.4" + "@abp/ng.core": ">=7.4.0-rc.5", + "@abp/ng.theme.shared": ">=7.4.0-rc.5" }, "dependencies": { "tslib": "^2.0.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json index 3fad7aeb6d..6d7df5249f 100644 --- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-identityserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.5" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock index 739bb79d1c..8e55b67a23 100644 --- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock @@ -2,39 +2,39 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.4.tgz#4b53752513bf727b4962093d8ff4daac66139718" - integrity sha512-Jj3faRxJdaaoJzPcyhJgb7/8+7oEK6rRY4R3uP5pF50khR/yNHWcLP6WCZ+LQZu7fKlEpiQ5EITiWRpP/5hf/w== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.4" - -"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.4.tgz#9f8b6c33c17da1c0bc0c596ef2fb9fe93248c7fb" - integrity sha512-lL6WWRSsrDIGBQl3tNFifLt08JEQycCrK0E57F3NquviFY/erducHp+dfJJ+s1OAadUlkvmsB5Scs8xQMQCaig== - dependencies: - "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.4" - "@abp/bootstrap" "~7.4.0-rc.4" - "@abp/bootstrap-datepicker" "~7.4.0-rc.4" - "@abp/bootstrap-daterangepicker" "~7.4.0-rc.4" - "@abp/datatables.net-bs5" "~7.4.0-rc.4" - "@abp/font-awesome" "~7.4.0-rc.4" - "@abp/jquery-form" "~7.4.0-rc.4" - "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.4" - "@abp/lodash" "~7.4.0-rc.4" - "@abp/luxon" "~7.4.0-rc.4" - "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.4" - "@abp/moment" "~7.4.0-rc.4" - "@abp/select2" "~7.4.0-rc.4" - "@abp/sweetalert2" "~7.4.0-rc.4" - "@abp/timeago" "~7.4.0-rc.4" - "@abp/toastr" "~7.4.0-rc.4" - -"@abp/aspnetcore.mvc.ui@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.4.tgz#3854183dea1a24dee42debc0a5413de0f08d3d0d" - integrity sha512-TTAnlbh8KcDWakMCtawHgrbcmoqvLdLxz1DDWUTkmCEQPImdrh52Jf1LNrL/771hug1dk5kqAuH5R5nBFGfnbA== +"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.5.tgz#20fb27493a42a88adf423862f79031a840fb741e" + integrity sha512-1pjQT+JWd+5Cqfzvt1CGii8Igd2YVpMd5vRYXkogKdjtJiElgaJwIbhjGMnV/neaSF2eR6y5g1SW6BP6NNN8yA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.5" + +"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.5.tgz#ebf4732a466ea187afb870571aea2862e278906a" + integrity sha512-EOtOHV9yEHX8dL0tSDTDQYXDVsNIuItDb5TpF30Jg8JIkz2xGnijXh71BmVb2QF7mZ2Q048BhAPc3s0i9cWU0g== + dependencies: + "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.5" + "@abp/bootstrap" "~7.4.0-rc.5" + "@abp/bootstrap-datepicker" "~7.4.0-rc.5" + "@abp/bootstrap-daterangepicker" "~7.4.0-rc.5" + "@abp/datatables.net-bs5" "~7.4.0-rc.5" + "@abp/font-awesome" "~7.4.0-rc.5" + "@abp/jquery-form" "~7.4.0-rc.5" + "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.5" + "@abp/lodash" "~7.4.0-rc.5" + "@abp/luxon" "~7.4.0-rc.5" + "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.5" + "@abp/moment" "~7.4.0-rc.5" + "@abp/select2" "~7.4.0-rc.5" + "@abp/sweetalert2" "~7.4.0-rc.5" + "@abp/timeago" "~7.4.0-rc.5" + "@abp/toastr" "~7.4.0-rc.5" + +"@abp/aspnetcore.mvc.ui@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.5.tgz#a71ff2736472b8028e09a6de1e998c9523c00f81" + integrity sha512-meoBTIfJ88Fp9HZKRTn9URXSMGGUioRIFr206VVE2pwOqO5lLKTbRkpeSM46uzLNoWRj+Rn4NDKdYdEsjWj1IQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,158 +43,158 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.4.tgz#2fe2c68d628383d1d8ff349dfb7da9b5b4eb04c1" - integrity sha512-C+vLaehe6lZhLPuJM5ZfwsHOqt3htOVpyjZvBwyX3DdXIwsLpg7nCvTPgtXbt1CNSJ3aePkbdQDEaLv603WRGw== +"@abp/bootstrap-datepicker@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.5.tgz#943ef8fb6bc984788f08a828a187495bc8fc3be8" + integrity sha512-bhBiHDichxIsqN8FyeFkViOyGnQyLs9RG+ZIRnM7l9zP+8m7InB+RFbRCi7IRLnNVoT9C+Fy5O9kOhTyd48dkg== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.4.tgz#d8b950f91d5963ef7725f2bc69b80c24b3626235" - integrity sha512-ehoqkI07UGc/MbhENOV7BkB67VNyRa8lYC9gBBlD+59VAsg1f3b/UzVJGnTvcPPPwA4SyJL56dDZbxj8uI1TAQ== +"@abp/bootstrap-daterangepicker@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.5.tgz#052393e99a181fe48814a86b3adb47e302ef1d50" + integrity sha512-N4gBrfOA9Jl9qcDo8EAgGI1SZHnQb7bFcAdW2rQlRhCYuhd89wR3RWqsljh+UwEBqu/LPzYMGTQ+TLdLHi2rug== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.4.tgz#794850366d0a85a6e2ad703590ad91f5616d50ad" - integrity sha512-+tcO/o1hnpiI8HPjnh5BGZn7NbVnQsKAgR5nJkZvHlVdsiFnufgtVfKoM0n7lalN/h0caCLbBxkS+OVrpTCv6Q== +"@abp/bootstrap@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.5.tgz#5718af8004ac3dc00c451cab07a4260ca0e45ac5" + integrity sha512-FAB+yeKXn+P0YuuzFYrBUAQSEIoIm7FSwxb13ouCRb17XgHXcSp2ikdPIMcctGnq/Af31WxfJjCWGLNVcZCCmw== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" bootstrap "^5.1.3" -"@abp/core@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.4.tgz#4a2aebc67fdd1f9296d34c33cba7d3b5d5b186d6" - integrity sha512-nBEks/7mCqYEhvKZtda6bi56eh0hiVym+/VCe9D9YXSVuFAoudmN1KyBL1/HLrJOFYCenP8TQMXDxXg9Qv4ILQ== +"@abp/core@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.5.tgz#93eb68ac9828c4ce66355e651f194fcc5e171bf3" + integrity sha512-2oqRviXbS1Avuj63u/s8AjnLEuR4FvG+hpk81DA39hNiNPvwosG24Ie9nxaa0A5F7kcCEvRM7JAmc/0MQ7FJKg== dependencies: - "@abp/utils" "~7.4.0-rc.4" + "@abp/utils" "~7.4.0-rc.5" -"@abp/datatables.net-bs5@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.4.tgz#cc205cdee4d24e9b9059797443cb52996f42b431" - integrity sha512-DnKtYe9LgYfRAATQRlbs90jDH4KM6jbYIcXht/CibU8c/hGWXver/wk+13w4lMlzm+eDw/yJ1qNKfFTYMCXaBw== +"@abp/datatables.net-bs5@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.5.tgz#036e98a69c7bb51f56755b93912c00841ffc6e00" + integrity sha512-OZlNJynMFus4AxPMoCAfIE15X3PdGB5UwKJTi7XCza4Ok3F+mevmsIwOpjLqs1OpbLEIHK3Ftk6nXfTMpFZQpQ== dependencies: - "@abp/datatables.net" "~7.4.0-rc.4" + "@abp/datatables.net" "~7.4.0-rc.5" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.4.tgz#eb9458cd0f0c1f1de9321bb2e637357e67ac68d9" - integrity sha512-OipmXFl4b//5agl+zIhhDT9tpt/QLcd6Ux+Ual8Wavh2YuGU7KDgCBWPN9W9McCfyExtejjp1H0epk6rl/EMXg== +"@abp/datatables.net@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.5.tgz#32fa40f3a1f397faf06b25e3653cdfb74256a2e5" + integrity sha512-grRRJfrDZz4v8t0QP1/bXlDNcZpWdcxLI4MsHORekt9EXrWx2iWtcZt4yhs7GLhX2swc6VuNf3OCO8/S5obQpQ== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" datatables.net "^1.11.4" -"@abp/font-awesome@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.4.tgz#720c32147bc5590b52911121a01a5f951ca09092" - integrity sha512-6gmsa42ernWVU8jfUl+ZpoSnSbr9Gc8nhl+cMKwo7AkbPvtMhR/tnH0v+4/0wJl+SWelvXeTWL7OHi3ZmFsNgA== +"@abp/font-awesome@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.5.tgz#1171b3556eac71894083bfe0776dd170783d8f17" + integrity sha512-UUJZ2Q7pYag4j6C83ElV7z3eG72HthpJW/RQ4/rMjoeW5Dbduomuihx0WtDqtoNmsYdjH7Z0nWUhKzRUv3Yo9Q== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.4.tgz#669f9adda562867e8db075718577c8fe0222f979" - integrity sha512-MOqz5rIL3gZaABvGI5veMDZOl/8O+i5uJagmLpvjY9rau8tygJQ7t7pYHQEMlfQchNRb/m7p5WSgmvZ/R80BKw== +"@abp/jquery-form@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.5.tgz#a3a66b333c839f36af88808cf4588162fdf8237f" + integrity sha512-PotRlDmzxnG6zk8yAJCR6MthK5tWH6disgWPsCxl+UN6d470V24ei0ZWx/eN2YKxRnRYLrrdvbgH9OMM7Clq9g== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.4.tgz#7092b57d7362a4e201f82c41f4ef38edc50acf95" - integrity sha512-DUvT1jMt4YwML3oTXA369NaQGWVR2nDDf0J6RfHjzT1geSzJiquYN2PAZ7u/tPqQgbS62+HIvI+zbWZ1rNJ6XA== +"@abp/jquery-validation-unobtrusive@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.5.tgz#7796c2bb644ebdff18e2c74822570a710d0d863e" + integrity sha512-6YWYUfPfjf1fZIEWHR9wqzJuWI1hmrGnm9uILZ9o829pvqdC7ctqemv2+PwSYPDzTcmk5ys54NHcXcwq8/H/JA== dependencies: - "@abp/jquery-validation" "~7.4.0-rc.4" + "@abp/jquery-validation" "~7.4.0-rc.5" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.4.tgz#b74f2d0138b7caf46c0085e57fcdba92a917f55a" - integrity sha512-qaYmHUr6/d13LSXHII8XIE1MuVbBPswToKN7y0uw3joFcw7NyQCEOkAkTxpGy0V6uhP/4zbxs90SYkJfy60zww== +"@abp/jquery-validation@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.5.tgz#e27d2936d6dc0fb9182f1cf1f73019b2e1873b87" + integrity sha512-O1RSRI1UH8ZTMBTfkQG+LSvE+4W5W93Rw0bUJV8dI5lWT9cBuoQkWVLqOZqr9JX9ZMuYMf4GDyWYYT5MS4+EQQ== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" jquery-validation "^1.19.3" -"@abp/jquery@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.4.tgz#615c4a40b451cd526085a69335bc6f41ebe99223" - integrity sha512-fuU5bt4x2NBeJXOCEyfeDPo8UiVoKqgjuKvXLoiAvt+za5qGitRQuPbJAakDKVxGWa7idu/d/8oYLWEqWw3Luw== +"@abp/jquery@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.5.tgz#fb664d1706e2ff02f24bf910363ff8221a447b7c" + integrity sha512-o/bTJKO7g9H0NChDtgYanG049Zihmojlt86fNfJ5p0uCRAbkrLnUQfOqTw5NhtQAbPmNyR+pK6Tk9oKlN6/V0Q== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" jquery "~3.6.0" -"@abp/lodash@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.4.tgz#0c94552b4debf025afdfe636cca753169dbcba85" - integrity sha512-oWrSBwDRb7EfvnHiPYSLzIuwZ6rvm4j6yjtxIe1rQt4X9aWENVXUPtg6ZG59kpZGEAFcIC5xJcTNfkLui7Xorw== +"@abp/lodash@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.5.tgz#68123983a07f334230692a2a9750b0f3a9681000" + integrity sha512-MleBwBDXCg4pLyQVAU94/j5wPFhsZ3GU8UlBokhS8QXu4J444GyBH6DCes9VPFvAcKe0WJzCNe2wPn9GU2bmiA== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" lodash "^4.17.21" -"@abp/luxon@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.4.tgz#6c6247b5672bfd49ef64a3a3ea94aa74eeeeaae8" - integrity sha512-B2QYSAP8UInRoMEo+X9499s1VVDpjIbojTIqENufouGUqdRlDN+0ZJYHKmliQloQ1HZdGHOs0z8kFA4at+bsgQ== +"@abp/luxon@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.5.tgz#2a5ba7a7d43d35b8ed7e839b85518e26afe21890" + integrity sha512-E5PsSaLRwziJsi0OVBokZ7n1SCzBBQv25P9bc29aC0t8rjHNpkmhR7zHDF3XgUQSTiBWy35l69l+ZD9AEhm9ZA== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.4.tgz#7aacc70573587058a49f9d464c8fce8c030410d9" - integrity sha512-vhwf7J98/YbHLf8GykvmF7Ok8QGjzR5BTb5VHpZ22jTdEIPPv0dTvwkQJrcyGg4DHGOVECFL+FOTud89JWtYEQ== +"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.5.tgz#4aefd88adab0377d9fb25c2f41c7a30ce96e3655" + integrity sha512-/9kYE1Rq51kXGxA2Et+br4xV3WsXA9Z2AA/wEU16pxbOwu0biBOffZbLWhfqKoi//JVxZJuxm8sjrA4E7hpjcg== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.4.tgz#f2b10c654d057100efb9919d0c5ba56f6c73f719" - integrity sha512-EUmJVN4eb6q7+gn5ze+f+wftp4jRzBojUU/2IjfHq9BmpqMewGO4OS3gfvomXEnx5z3cNci8cOT9is5IQ8jpfw== +"@abp/moment@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.5.tgz#5bbc6fa78f9667253568e68936b6c8edea74d319" + integrity sha512-v46BvWM6pWLswUeYhYM+sw3UeC6k+y2a49czY1gsW/ydrj8O61pbxulzPW3CLeqN+10qq4S7tJr3lK/o0Igq7A== dependencies: moment "^2.9.0" -"@abp/select2@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.4.tgz#07a1336943af96434cb76b5178bd8344f09e5e25" - integrity sha512-yN4fq+a27zYMsOb5xGJHRxO/GM/ZiPPOK2VryB7dy8bLC/jlMWPiFIRQDR6HY7BMPVHTds4zIhJeH2kWP/vgdA== +"@abp/select2@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.5.tgz#7fa5d7bc578e5a13f1cb77eb3885fd10bc987356" + integrity sha512-czk5o1Ogd8l+qolisQ6jDdqOCIsl129pI0DQsWwn5f/FGyLAkzZ8CQt8mx04PE6R4mNLLFwcMspPuTyxONLwyg== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" select2 "^4.0.13" -"@abp/sweetalert2@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.4.tgz#9588a8b89850459ee78c1c1f4bd890ebe8a319f4" - integrity sha512-rJLtDiG8kmpcwPxTTdNlVeto53DeuE80O3j7x4A/qBGNo9bfL+g83nwwR8Y+GnT0pLaNB3132rUMBbfSPsSgOA== +"@abp/sweetalert2@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.5.tgz#8c05235d32460e0f590841fd5fddb66a5ec664ed" + integrity sha512-uQ4qKj4szRBv1AU06U7F6z8iRGJTAs0yrJZuAt287sz1uZTXWhlN9nvfIiG/1Z8VCNHHDp12oPyVZzKOM3PhbQ== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" sweetalert2 "^11.3.6" -"@abp/timeago@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.4.tgz#a1ebcb037d5593439af42c87772f65e414faf6c3" - integrity sha512-BYwRqozV187taz67LCX3PcbwL8WyqiQgOYDnS5m+HnfjngzgWcOvGQqG3eskI057xu04ZyjMUIhaIJpGT3QDsw== +"@abp/timeago@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.5.tgz#02dfa7b5d59e71e45a9d48595a242dc5f25f4e21" + integrity sha512-EA+pSCSSGYtYaQABfhYWsMoVqgVGz8Ykn6a7tVc34Z5qfPKucgGKfuppRmQOZVz9n8zp9W/94BnDF2kRfP+FEg== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" timeago "^1.6.7" -"@abp/toastr@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.4.tgz#71327a6549a7744534cf20fb3efe94ddc844738f" - integrity sha512-KEpMqPO9s8dnqLJeeyarS10g1LaNv2JKVYu3tjlhlquh9u14+2haE/RHXl0/KEhbkvqxosSc1AwhIcZD8eWyew== +"@abp/toastr@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.5.tgz#ba2a623083c1182f1a66a21b932a02bb1665111b" + integrity sha512-BkJjWtbnPHImKL5g8Xwak2y7XdGk62q2bYZ/vFtSUY033Lr/3ufQxlVX6pXumodhPIrus7xEyIerxLWg8tYyAQ== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" toastr "^2.1.4" -"@abp/utils@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.4.tgz#5f60a548e5cf15dadb9ab25a406ba26a323fff20" - integrity sha512-UEp+u6kMLbqn3lrB0lI0b59s9+mhWckH1Hmo5Lv+Pam9d8FFGYhxho3UyCWVN+oWj/6W/SXw8XzgQBv490APHA== +"@abp/utils@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.5.tgz#f52cde2297a2b33562ee291541ec66f2080eafbd" + integrity sha512-9kPPKaA5vUVUYArblfaIurAaWxeaOfM/Sc9yzDmNWOTQ7FSBhCEKeZbQvj1X+mNpOV4rxEvqZ19LbvJ6RZs+AA== dependencies: just-compare "^2.3.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json b/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json index 704a94ab02..d821bb0862 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.5" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock index 739bb79d1c..8e55b67a23 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock @@ -2,39 +2,39 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.4.tgz#4b53752513bf727b4962093d8ff4daac66139718" - integrity sha512-Jj3faRxJdaaoJzPcyhJgb7/8+7oEK6rRY4R3uP5pF50khR/yNHWcLP6WCZ+LQZu7fKlEpiQ5EITiWRpP/5hf/w== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.4" - -"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.4.tgz#9f8b6c33c17da1c0bc0c596ef2fb9fe93248c7fb" - integrity sha512-lL6WWRSsrDIGBQl3tNFifLt08JEQycCrK0E57F3NquviFY/erducHp+dfJJ+s1OAadUlkvmsB5Scs8xQMQCaig== - dependencies: - "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.4" - "@abp/bootstrap" "~7.4.0-rc.4" - "@abp/bootstrap-datepicker" "~7.4.0-rc.4" - "@abp/bootstrap-daterangepicker" "~7.4.0-rc.4" - "@abp/datatables.net-bs5" "~7.4.0-rc.4" - "@abp/font-awesome" "~7.4.0-rc.4" - "@abp/jquery-form" "~7.4.0-rc.4" - "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.4" - "@abp/lodash" "~7.4.0-rc.4" - "@abp/luxon" "~7.4.0-rc.4" - "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.4" - "@abp/moment" "~7.4.0-rc.4" - "@abp/select2" "~7.4.0-rc.4" - "@abp/sweetalert2" "~7.4.0-rc.4" - "@abp/timeago" "~7.4.0-rc.4" - "@abp/toastr" "~7.4.0-rc.4" - -"@abp/aspnetcore.mvc.ui@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.4.tgz#3854183dea1a24dee42debc0a5413de0f08d3d0d" - integrity sha512-TTAnlbh8KcDWakMCtawHgrbcmoqvLdLxz1DDWUTkmCEQPImdrh52Jf1LNrL/771hug1dk5kqAuH5R5nBFGfnbA== +"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.5.tgz#20fb27493a42a88adf423862f79031a840fb741e" + integrity sha512-1pjQT+JWd+5Cqfzvt1CGii8Igd2YVpMd5vRYXkogKdjtJiElgaJwIbhjGMnV/neaSF2eR6y5g1SW6BP6NNN8yA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.5" + +"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.5.tgz#ebf4732a466ea187afb870571aea2862e278906a" + integrity sha512-EOtOHV9yEHX8dL0tSDTDQYXDVsNIuItDb5TpF30Jg8JIkz2xGnijXh71BmVb2QF7mZ2Q048BhAPc3s0i9cWU0g== + dependencies: + "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.5" + "@abp/bootstrap" "~7.4.0-rc.5" + "@abp/bootstrap-datepicker" "~7.4.0-rc.5" + "@abp/bootstrap-daterangepicker" "~7.4.0-rc.5" + "@abp/datatables.net-bs5" "~7.4.0-rc.5" + "@abp/font-awesome" "~7.4.0-rc.5" + "@abp/jquery-form" "~7.4.0-rc.5" + "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.5" + "@abp/lodash" "~7.4.0-rc.5" + "@abp/luxon" "~7.4.0-rc.5" + "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.5" + "@abp/moment" "~7.4.0-rc.5" + "@abp/select2" "~7.4.0-rc.5" + "@abp/sweetalert2" "~7.4.0-rc.5" + "@abp/timeago" "~7.4.0-rc.5" + "@abp/toastr" "~7.4.0-rc.5" + +"@abp/aspnetcore.mvc.ui@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.5.tgz#a71ff2736472b8028e09a6de1e998c9523c00f81" + integrity sha512-meoBTIfJ88Fp9HZKRTn9URXSMGGUioRIFr206VVE2pwOqO5lLKTbRkpeSM46uzLNoWRj+Rn4NDKdYdEsjWj1IQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,158 +43,158 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.4.tgz#2fe2c68d628383d1d8ff349dfb7da9b5b4eb04c1" - integrity sha512-C+vLaehe6lZhLPuJM5ZfwsHOqt3htOVpyjZvBwyX3DdXIwsLpg7nCvTPgtXbt1CNSJ3aePkbdQDEaLv603WRGw== +"@abp/bootstrap-datepicker@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.5.tgz#943ef8fb6bc984788f08a828a187495bc8fc3be8" + integrity sha512-bhBiHDichxIsqN8FyeFkViOyGnQyLs9RG+ZIRnM7l9zP+8m7InB+RFbRCi7IRLnNVoT9C+Fy5O9kOhTyd48dkg== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.4.tgz#d8b950f91d5963ef7725f2bc69b80c24b3626235" - integrity sha512-ehoqkI07UGc/MbhENOV7BkB67VNyRa8lYC9gBBlD+59VAsg1f3b/UzVJGnTvcPPPwA4SyJL56dDZbxj8uI1TAQ== +"@abp/bootstrap-daterangepicker@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.5.tgz#052393e99a181fe48814a86b3adb47e302ef1d50" + integrity sha512-N4gBrfOA9Jl9qcDo8EAgGI1SZHnQb7bFcAdW2rQlRhCYuhd89wR3RWqsljh+UwEBqu/LPzYMGTQ+TLdLHi2rug== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.4.tgz#794850366d0a85a6e2ad703590ad91f5616d50ad" - integrity sha512-+tcO/o1hnpiI8HPjnh5BGZn7NbVnQsKAgR5nJkZvHlVdsiFnufgtVfKoM0n7lalN/h0caCLbBxkS+OVrpTCv6Q== +"@abp/bootstrap@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.5.tgz#5718af8004ac3dc00c451cab07a4260ca0e45ac5" + integrity sha512-FAB+yeKXn+P0YuuzFYrBUAQSEIoIm7FSwxb13ouCRb17XgHXcSp2ikdPIMcctGnq/Af31WxfJjCWGLNVcZCCmw== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" bootstrap "^5.1.3" -"@abp/core@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.4.tgz#4a2aebc67fdd1f9296d34c33cba7d3b5d5b186d6" - integrity sha512-nBEks/7mCqYEhvKZtda6bi56eh0hiVym+/VCe9D9YXSVuFAoudmN1KyBL1/HLrJOFYCenP8TQMXDxXg9Qv4ILQ== +"@abp/core@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.5.tgz#93eb68ac9828c4ce66355e651f194fcc5e171bf3" + integrity sha512-2oqRviXbS1Avuj63u/s8AjnLEuR4FvG+hpk81DA39hNiNPvwosG24Ie9nxaa0A5F7kcCEvRM7JAmc/0MQ7FJKg== dependencies: - "@abp/utils" "~7.4.0-rc.4" + "@abp/utils" "~7.4.0-rc.5" -"@abp/datatables.net-bs5@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.4.tgz#cc205cdee4d24e9b9059797443cb52996f42b431" - integrity sha512-DnKtYe9LgYfRAATQRlbs90jDH4KM6jbYIcXht/CibU8c/hGWXver/wk+13w4lMlzm+eDw/yJ1qNKfFTYMCXaBw== +"@abp/datatables.net-bs5@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.5.tgz#036e98a69c7bb51f56755b93912c00841ffc6e00" + integrity sha512-OZlNJynMFus4AxPMoCAfIE15X3PdGB5UwKJTi7XCza4Ok3F+mevmsIwOpjLqs1OpbLEIHK3Ftk6nXfTMpFZQpQ== dependencies: - "@abp/datatables.net" "~7.4.0-rc.4" + "@abp/datatables.net" "~7.4.0-rc.5" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.4.tgz#eb9458cd0f0c1f1de9321bb2e637357e67ac68d9" - integrity sha512-OipmXFl4b//5agl+zIhhDT9tpt/QLcd6Ux+Ual8Wavh2YuGU7KDgCBWPN9W9McCfyExtejjp1H0epk6rl/EMXg== +"@abp/datatables.net@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.5.tgz#32fa40f3a1f397faf06b25e3653cdfb74256a2e5" + integrity sha512-grRRJfrDZz4v8t0QP1/bXlDNcZpWdcxLI4MsHORekt9EXrWx2iWtcZt4yhs7GLhX2swc6VuNf3OCO8/S5obQpQ== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" datatables.net "^1.11.4" -"@abp/font-awesome@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.4.tgz#720c32147bc5590b52911121a01a5f951ca09092" - integrity sha512-6gmsa42ernWVU8jfUl+ZpoSnSbr9Gc8nhl+cMKwo7AkbPvtMhR/tnH0v+4/0wJl+SWelvXeTWL7OHi3ZmFsNgA== +"@abp/font-awesome@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.5.tgz#1171b3556eac71894083bfe0776dd170783d8f17" + integrity sha512-UUJZ2Q7pYag4j6C83ElV7z3eG72HthpJW/RQ4/rMjoeW5Dbduomuihx0WtDqtoNmsYdjH7Z0nWUhKzRUv3Yo9Q== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.4.tgz#669f9adda562867e8db075718577c8fe0222f979" - integrity sha512-MOqz5rIL3gZaABvGI5veMDZOl/8O+i5uJagmLpvjY9rau8tygJQ7t7pYHQEMlfQchNRb/m7p5WSgmvZ/R80BKw== +"@abp/jquery-form@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.5.tgz#a3a66b333c839f36af88808cf4588162fdf8237f" + integrity sha512-PotRlDmzxnG6zk8yAJCR6MthK5tWH6disgWPsCxl+UN6d470V24ei0ZWx/eN2YKxRnRYLrrdvbgH9OMM7Clq9g== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.4.tgz#7092b57d7362a4e201f82c41f4ef38edc50acf95" - integrity sha512-DUvT1jMt4YwML3oTXA369NaQGWVR2nDDf0J6RfHjzT1geSzJiquYN2PAZ7u/tPqQgbS62+HIvI+zbWZ1rNJ6XA== +"@abp/jquery-validation-unobtrusive@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.5.tgz#7796c2bb644ebdff18e2c74822570a710d0d863e" + integrity sha512-6YWYUfPfjf1fZIEWHR9wqzJuWI1hmrGnm9uILZ9o829pvqdC7ctqemv2+PwSYPDzTcmk5ys54NHcXcwq8/H/JA== dependencies: - "@abp/jquery-validation" "~7.4.0-rc.4" + "@abp/jquery-validation" "~7.4.0-rc.5" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.4.tgz#b74f2d0138b7caf46c0085e57fcdba92a917f55a" - integrity sha512-qaYmHUr6/d13LSXHII8XIE1MuVbBPswToKN7y0uw3joFcw7NyQCEOkAkTxpGy0V6uhP/4zbxs90SYkJfy60zww== +"@abp/jquery-validation@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.5.tgz#e27d2936d6dc0fb9182f1cf1f73019b2e1873b87" + integrity sha512-O1RSRI1UH8ZTMBTfkQG+LSvE+4W5W93Rw0bUJV8dI5lWT9cBuoQkWVLqOZqr9JX9ZMuYMf4GDyWYYT5MS4+EQQ== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" jquery-validation "^1.19.3" -"@abp/jquery@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.4.tgz#615c4a40b451cd526085a69335bc6f41ebe99223" - integrity sha512-fuU5bt4x2NBeJXOCEyfeDPo8UiVoKqgjuKvXLoiAvt+za5qGitRQuPbJAakDKVxGWa7idu/d/8oYLWEqWw3Luw== +"@abp/jquery@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.5.tgz#fb664d1706e2ff02f24bf910363ff8221a447b7c" + integrity sha512-o/bTJKO7g9H0NChDtgYanG049Zihmojlt86fNfJ5p0uCRAbkrLnUQfOqTw5NhtQAbPmNyR+pK6Tk9oKlN6/V0Q== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" jquery "~3.6.0" -"@abp/lodash@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.4.tgz#0c94552b4debf025afdfe636cca753169dbcba85" - integrity sha512-oWrSBwDRb7EfvnHiPYSLzIuwZ6rvm4j6yjtxIe1rQt4X9aWENVXUPtg6ZG59kpZGEAFcIC5xJcTNfkLui7Xorw== +"@abp/lodash@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.5.tgz#68123983a07f334230692a2a9750b0f3a9681000" + integrity sha512-MleBwBDXCg4pLyQVAU94/j5wPFhsZ3GU8UlBokhS8QXu4J444GyBH6DCes9VPFvAcKe0WJzCNe2wPn9GU2bmiA== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" lodash "^4.17.21" -"@abp/luxon@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.4.tgz#6c6247b5672bfd49ef64a3a3ea94aa74eeeeaae8" - integrity sha512-B2QYSAP8UInRoMEo+X9499s1VVDpjIbojTIqENufouGUqdRlDN+0ZJYHKmliQloQ1HZdGHOs0z8kFA4at+bsgQ== +"@abp/luxon@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.5.tgz#2a5ba7a7d43d35b8ed7e839b85518e26afe21890" + integrity sha512-E5PsSaLRwziJsi0OVBokZ7n1SCzBBQv25P9bc29aC0t8rjHNpkmhR7zHDF3XgUQSTiBWy35l69l+ZD9AEhm9ZA== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.4.tgz#7aacc70573587058a49f9d464c8fce8c030410d9" - integrity sha512-vhwf7J98/YbHLf8GykvmF7Ok8QGjzR5BTb5VHpZ22jTdEIPPv0dTvwkQJrcyGg4DHGOVECFL+FOTud89JWtYEQ== +"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.5.tgz#4aefd88adab0377d9fb25c2f41c7a30ce96e3655" + integrity sha512-/9kYE1Rq51kXGxA2Et+br4xV3WsXA9Z2AA/wEU16pxbOwu0biBOffZbLWhfqKoi//JVxZJuxm8sjrA4E7hpjcg== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.4.tgz#f2b10c654d057100efb9919d0c5ba56f6c73f719" - integrity sha512-EUmJVN4eb6q7+gn5ze+f+wftp4jRzBojUU/2IjfHq9BmpqMewGO4OS3gfvomXEnx5z3cNci8cOT9is5IQ8jpfw== +"@abp/moment@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.5.tgz#5bbc6fa78f9667253568e68936b6c8edea74d319" + integrity sha512-v46BvWM6pWLswUeYhYM+sw3UeC6k+y2a49czY1gsW/ydrj8O61pbxulzPW3CLeqN+10qq4S7tJr3lK/o0Igq7A== dependencies: moment "^2.9.0" -"@abp/select2@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.4.tgz#07a1336943af96434cb76b5178bd8344f09e5e25" - integrity sha512-yN4fq+a27zYMsOb5xGJHRxO/GM/ZiPPOK2VryB7dy8bLC/jlMWPiFIRQDR6HY7BMPVHTds4zIhJeH2kWP/vgdA== +"@abp/select2@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.5.tgz#7fa5d7bc578e5a13f1cb77eb3885fd10bc987356" + integrity sha512-czk5o1Ogd8l+qolisQ6jDdqOCIsl129pI0DQsWwn5f/FGyLAkzZ8CQt8mx04PE6R4mNLLFwcMspPuTyxONLwyg== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" select2 "^4.0.13" -"@abp/sweetalert2@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.4.tgz#9588a8b89850459ee78c1c1f4bd890ebe8a319f4" - integrity sha512-rJLtDiG8kmpcwPxTTdNlVeto53DeuE80O3j7x4A/qBGNo9bfL+g83nwwR8Y+GnT0pLaNB3132rUMBbfSPsSgOA== +"@abp/sweetalert2@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.5.tgz#8c05235d32460e0f590841fd5fddb66a5ec664ed" + integrity sha512-uQ4qKj4szRBv1AU06U7F6z8iRGJTAs0yrJZuAt287sz1uZTXWhlN9nvfIiG/1Z8VCNHHDp12oPyVZzKOM3PhbQ== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" sweetalert2 "^11.3.6" -"@abp/timeago@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.4.tgz#a1ebcb037d5593439af42c87772f65e414faf6c3" - integrity sha512-BYwRqozV187taz67LCX3PcbwL8WyqiQgOYDnS5m+HnfjngzgWcOvGQqG3eskI057xu04ZyjMUIhaIJpGT3QDsw== +"@abp/timeago@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.5.tgz#02dfa7b5d59e71e45a9d48595a242dc5f25f4e21" + integrity sha512-EA+pSCSSGYtYaQABfhYWsMoVqgVGz8Ykn6a7tVc34Z5qfPKucgGKfuppRmQOZVz9n8zp9W/94BnDF2kRfP+FEg== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" timeago "^1.6.7" -"@abp/toastr@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.4.tgz#71327a6549a7744534cf20fb3efe94ddc844738f" - integrity sha512-KEpMqPO9s8dnqLJeeyarS10g1LaNv2JKVYu3tjlhlquh9u14+2haE/RHXl0/KEhbkvqxosSc1AwhIcZD8eWyew== +"@abp/toastr@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.5.tgz#ba2a623083c1182f1a66a21b932a02bb1665111b" + integrity sha512-BkJjWtbnPHImKL5g8Xwak2y7XdGk62q2bYZ/vFtSUY033Lr/3ufQxlVX6pXumodhPIrus7xEyIerxLWg8tYyAQ== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" toastr "^2.1.4" -"@abp/utils@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.4.tgz#5f60a548e5cf15dadb9ab25a406ba26a323fff20" - integrity sha512-UEp+u6kMLbqn3lrB0lI0b59s9+mhWckH1Hmo5Lv+Pam9d8FFGYhxho3UyCWVN+oWj/6W/SXw8XzgQBv490APHA== +"@abp/utils@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.5.tgz#f52cde2297a2b33562ee291541ec66f2080eafbd" + integrity sha512-9kPPKaA5vUVUYArblfaIurAaWxeaOfM/Sc9yzDmNWOTQ7FSBhCEKeZbQvj1X+mNpOV4rxEvqZ19LbvJ6RZs+AA== dependencies: just-compare "^2.3.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json index af94f94bb5..c05ca29954 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.4", - "@abp/cms-kit": "7.4.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.5", + "@abp/cms-kit": "7.4.0-rc.5" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock index 21183a1e78..d803491fb8 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock @@ -2,39 +2,39 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.4.tgz#4b53752513bf727b4962093d8ff4daac66139718" - integrity sha512-Jj3faRxJdaaoJzPcyhJgb7/8+7oEK6rRY4R3uP5pF50khR/yNHWcLP6WCZ+LQZu7fKlEpiQ5EITiWRpP/5hf/w== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.4" - -"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.4.tgz#9f8b6c33c17da1c0bc0c596ef2fb9fe93248c7fb" - integrity sha512-lL6WWRSsrDIGBQl3tNFifLt08JEQycCrK0E57F3NquviFY/erducHp+dfJJ+s1OAadUlkvmsB5Scs8xQMQCaig== - dependencies: - "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.4" - "@abp/bootstrap" "~7.4.0-rc.4" - "@abp/bootstrap-datepicker" "~7.4.0-rc.4" - "@abp/bootstrap-daterangepicker" "~7.4.0-rc.4" - "@abp/datatables.net-bs5" "~7.4.0-rc.4" - "@abp/font-awesome" "~7.4.0-rc.4" - "@abp/jquery-form" "~7.4.0-rc.4" - "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.4" - "@abp/lodash" "~7.4.0-rc.4" - "@abp/luxon" "~7.4.0-rc.4" - "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.4" - "@abp/moment" "~7.4.0-rc.4" - "@abp/select2" "~7.4.0-rc.4" - "@abp/sweetalert2" "~7.4.0-rc.4" - "@abp/timeago" "~7.4.0-rc.4" - "@abp/toastr" "~7.4.0-rc.4" - -"@abp/aspnetcore.mvc.ui@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.4.tgz#3854183dea1a24dee42debc0a5413de0f08d3d0d" - integrity sha512-TTAnlbh8KcDWakMCtawHgrbcmoqvLdLxz1DDWUTkmCEQPImdrh52Jf1LNrL/771hug1dk5kqAuH5R5nBFGfnbA== +"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.5.tgz#20fb27493a42a88adf423862f79031a840fb741e" + integrity sha512-1pjQT+JWd+5Cqfzvt1CGii8Igd2YVpMd5vRYXkogKdjtJiElgaJwIbhjGMnV/neaSF2eR6y5g1SW6BP6NNN8yA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.5" + +"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.5.tgz#ebf4732a466ea187afb870571aea2862e278906a" + integrity sha512-EOtOHV9yEHX8dL0tSDTDQYXDVsNIuItDb5TpF30Jg8JIkz2xGnijXh71BmVb2QF7mZ2Q048BhAPc3s0i9cWU0g== + dependencies: + "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.5" + "@abp/bootstrap" "~7.4.0-rc.5" + "@abp/bootstrap-datepicker" "~7.4.0-rc.5" + "@abp/bootstrap-daterangepicker" "~7.4.0-rc.5" + "@abp/datatables.net-bs5" "~7.4.0-rc.5" + "@abp/font-awesome" "~7.4.0-rc.5" + "@abp/jquery-form" "~7.4.0-rc.5" + "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.5" + "@abp/lodash" "~7.4.0-rc.5" + "@abp/luxon" "~7.4.0-rc.5" + "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.5" + "@abp/moment" "~7.4.0-rc.5" + "@abp/select2" "~7.4.0-rc.5" + "@abp/sweetalert2" "~7.4.0-rc.5" + "@abp/timeago" "~7.4.0-rc.5" + "@abp/toastr" "~7.4.0-rc.5" + +"@abp/aspnetcore.mvc.ui@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.5.tgz#a71ff2736472b8028e09a6de1e998c9523c00f81" + integrity sha512-meoBTIfJ88Fp9HZKRTn9URXSMGGUioRIFr206VVE2pwOqO5lLKTbRkpeSM46uzLNoWRj+Rn4NDKdYdEsjWj1IQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,257 +43,257 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.4.tgz#2fe2c68d628383d1d8ff349dfb7da9b5b4eb04c1" - integrity sha512-C+vLaehe6lZhLPuJM5ZfwsHOqt3htOVpyjZvBwyX3DdXIwsLpg7nCvTPgtXbt1CNSJ3aePkbdQDEaLv603WRGw== +"@abp/bootstrap-datepicker@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.5.tgz#943ef8fb6bc984788f08a828a187495bc8fc3be8" + integrity sha512-bhBiHDichxIsqN8FyeFkViOyGnQyLs9RG+ZIRnM7l9zP+8m7InB+RFbRCi7IRLnNVoT9C+Fy5O9kOhTyd48dkg== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.4.tgz#d8b950f91d5963ef7725f2bc69b80c24b3626235" - integrity sha512-ehoqkI07UGc/MbhENOV7BkB67VNyRa8lYC9gBBlD+59VAsg1f3b/UzVJGnTvcPPPwA4SyJL56dDZbxj8uI1TAQ== +"@abp/bootstrap-daterangepicker@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.5.tgz#052393e99a181fe48814a86b3adb47e302ef1d50" + integrity sha512-N4gBrfOA9Jl9qcDo8EAgGI1SZHnQb7bFcAdW2rQlRhCYuhd89wR3RWqsljh+UwEBqu/LPzYMGTQ+TLdLHi2rug== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.4.tgz#794850366d0a85a6e2ad703590ad91f5616d50ad" - integrity sha512-+tcO/o1hnpiI8HPjnh5BGZn7NbVnQsKAgR5nJkZvHlVdsiFnufgtVfKoM0n7lalN/h0caCLbBxkS+OVrpTCv6Q== +"@abp/bootstrap@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.5.tgz#5718af8004ac3dc00c451cab07a4260ca0e45ac5" + integrity sha512-FAB+yeKXn+P0YuuzFYrBUAQSEIoIm7FSwxb13ouCRb17XgHXcSp2ikdPIMcctGnq/Af31WxfJjCWGLNVcZCCmw== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" bootstrap "^5.1.3" -"@abp/clipboard@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-7.4.0-rc.4.tgz#555f72dab99343520784cbb1cb3c6c50086500c0" - integrity sha512-p4Px63x5VaS7buwg/0TU26LIZ+LPAQOBAvlHWXl8QhvpdN5OjZPX+GyvEW4UkzcNbyoB7bn9bBUYRD1cDSmlzQ== +"@abp/clipboard@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-7.4.0-rc.5.tgz#54ca41b3284552a6595fda51caf12d715d3f64f5" + integrity sha512-1+XKIOPM77msa+xfWsFFZzLc450q2vq3/dDKSkFqKxj4PfnM5jqijoptG0k0EcBojOfTURESwREE1Xqjn3OjHg== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" clipboard "^2.0.8" -"@abp/cms-kit.admin@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/cms-kit.admin/-/cms-kit.admin-7.4.0-rc.4.tgz#3f219f1a0f8d132037dc61f16beabd20d0f5a23d" - integrity sha512-UrMWk+SUrH9xvFpvW/zphbiGXWjKr9NRixNT4f93XI5objZChPrlfFjE6T4aiLo5HWLScaCcgRpRZeGB8vwrqA== +"@abp/cms-kit.admin@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/cms-kit.admin/-/cms-kit.admin-7.4.0-rc.5.tgz#a34d12a82047e07f5e3f6f4b7b99915d6d30a4ba" + integrity sha512-GjJnlUSfagh5m1CAU1r40SrUv4T9EbkKL97CTr0Utqz5GvvfHEUpYOQFfetrYWKP6rv9Hh/TF9FIrg6hvVxWCw== dependencies: - "@abp/codemirror" "~7.4.0-rc.4" - "@abp/jstree" "~7.4.0-rc.4" - "@abp/slugify" "~7.4.0-rc.4" - "@abp/tui-editor" "~7.4.0-rc.4" - "@abp/uppy" "~7.4.0-rc.4" + "@abp/codemirror" "~7.4.0-rc.5" + "@abp/jstree" "~7.4.0-rc.5" + "@abp/slugify" "~7.4.0-rc.5" + "@abp/tui-editor" "~7.4.0-rc.5" + "@abp/uppy" "~7.4.0-rc.5" -"@abp/cms-kit.public@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/cms-kit.public/-/cms-kit.public-7.4.0-rc.4.tgz#6923e69becf7d3ee8924350488d084f3f2b323a0" - integrity sha512-Kj800zi8v4VgMjdZ9v3Old1VR9NsEcUcroAjK6RgPfX3WddB8qcTrGRrAjgz62OiFn/bXnb/iP0AjwjcqJejDg== +"@abp/cms-kit.public@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/cms-kit.public/-/cms-kit.public-7.4.0-rc.5.tgz#7bbe4b44b5abfd468ec207858e9cdcf97d5206f7" + integrity sha512-nJYaM6Lzl7rJoei/UAkYCPsJJK9300ZGzlbMkCTmAt2vQJgazu+lYCLWUuBx/ILaLdffsANiuNlRoaUhFIhJHg== dependencies: - "@abp/highlight.js" "~7.4.0-rc.4" - "@abp/star-rating-svg" "~7.4.0-rc.4" + "@abp/highlight.js" "~7.4.0-rc.5" + "@abp/star-rating-svg" "~7.4.0-rc.5" -"@abp/cms-kit@7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-7.4.0-rc.4.tgz#659f7ea0c0da4206ac3976f7968f221034c2f1f5" - integrity sha512-4RiB0VNFGfxnTsfz6xwwsgf71P2DgZ4IzREkaabFmSJ9sbaMpSBDTtVV+R3JJweMUJRpD+aX6XZ/3QDLpwVfyg== +"@abp/cms-kit@7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-7.4.0-rc.5.tgz#532f8c64bdf348a6f6a38267f0764ef8691e2204" + integrity sha512-P2cBacXellRnJuILJc61bqmaDQxjxzaZPl52upT3hj5TMpvj2DJW9eE48q21hcjuMePpBV0f3gD8t98wmGKeSQ== dependencies: - "@abp/cms-kit.admin" "~7.4.0-rc.4" - "@abp/cms-kit.public" "~7.4.0-rc.4" + "@abp/cms-kit.admin" "~7.4.0-rc.5" + "@abp/cms-kit.public" "~7.4.0-rc.5" -"@abp/codemirror@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-7.4.0-rc.4.tgz#9fffb24e3722bd8191b9f401107d1928908e0775" - integrity sha512-PLFw2Fz2e+r7FgHhUJ6mAnKYmbbC7efaukbRg740xyTawFkayZCbaRaGMQsHisVVFPZYw8A2V7TNpny4WxgCIA== +"@abp/codemirror@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-7.4.0-rc.5.tgz#0fc7e8679c85d791a759b37aaf72d4adda9e3e74" + integrity sha512-CYbPxdgDnpXlGzeEg16DNC1S6G1CHf5neuoB6Q4ZjcSKt4+wwVhhGkMq/aazSoIuwTavmpQ0RK2llwUUL6Wwhw== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" codemirror "^5.65.1" -"@abp/core@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.4.tgz#4a2aebc67fdd1f9296d34c33cba7d3b5d5b186d6" - integrity sha512-nBEks/7mCqYEhvKZtda6bi56eh0hiVym+/VCe9D9YXSVuFAoudmN1KyBL1/HLrJOFYCenP8TQMXDxXg9Qv4ILQ== +"@abp/core@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.5.tgz#93eb68ac9828c4ce66355e651f194fcc5e171bf3" + integrity sha512-2oqRviXbS1Avuj63u/s8AjnLEuR4FvG+hpk81DA39hNiNPvwosG24Ie9nxaa0A5F7kcCEvRM7JAmc/0MQ7FJKg== dependencies: - "@abp/utils" "~7.4.0-rc.4" + "@abp/utils" "~7.4.0-rc.5" -"@abp/datatables.net-bs5@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.4.tgz#cc205cdee4d24e9b9059797443cb52996f42b431" - integrity sha512-DnKtYe9LgYfRAATQRlbs90jDH4KM6jbYIcXht/CibU8c/hGWXver/wk+13w4lMlzm+eDw/yJ1qNKfFTYMCXaBw== +"@abp/datatables.net-bs5@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.5.tgz#036e98a69c7bb51f56755b93912c00841ffc6e00" + integrity sha512-OZlNJynMFus4AxPMoCAfIE15X3PdGB5UwKJTi7XCza4Ok3F+mevmsIwOpjLqs1OpbLEIHK3Ftk6nXfTMpFZQpQ== dependencies: - "@abp/datatables.net" "~7.4.0-rc.4" + "@abp/datatables.net" "~7.4.0-rc.5" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.4.tgz#eb9458cd0f0c1f1de9321bb2e637357e67ac68d9" - integrity sha512-OipmXFl4b//5agl+zIhhDT9tpt/QLcd6Ux+Ual8Wavh2YuGU7KDgCBWPN9W9McCfyExtejjp1H0epk6rl/EMXg== +"@abp/datatables.net@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.5.tgz#32fa40f3a1f397faf06b25e3653cdfb74256a2e5" + integrity sha512-grRRJfrDZz4v8t0QP1/bXlDNcZpWdcxLI4MsHORekt9EXrWx2iWtcZt4yhs7GLhX2swc6VuNf3OCO8/S5obQpQ== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" datatables.net "^1.11.4" -"@abp/font-awesome@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.4.tgz#720c32147bc5590b52911121a01a5f951ca09092" - integrity sha512-6gmsa42ernWVU8jfUl+ZpoSnSbr9Gc8nhl+cMKwo7AkbPvtMhR/tnH0v+4/0wJl+SWelvXeTWL7OHi3ZmFsNgA== +"@abp/font-awesome@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.5.tgz#1171b3556eac71894083bfe0776dd170783d8f17" + integrity sha512-UUJZ2Q7pYag4j6C83ElV7z3eG72HthpJW/RQ4/rMjoeW5Dbduomuihx0WtDqtoNmsYdjH7Z0nWUhKzRUv3Yo9Q== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/highlight.js@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-7.4.0-rc.4.tgz#25c99742250f15402374c4bf5b2c815468435680" - integrity sha512-d4BJQXN2UiCPgCVqFUL8OJzqfVwjrpRxKj8ALFtbNMT2HYw0mKOIGUpuRIvOu5P161OSDuKzhMTPZrp4SsjMXA== +"@abp/highlight.js@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-7.4.0-rc.5.tgz#a4a3369be71b3f7324dad73919f887d43f8afed6" + integrity sha512-X3z489NuC/yVie26inWLWRWsRElztBHWTSY27kf1FUpINbm/8/IfE57MQNaGKp1/awJy60KZS0jlDNzDxu2B8w== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" "@highlightjs/cdn-assets" "~11.4.0" -"@abp/jquery-form@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.4.tgz#669f9adda562867e8db075718577c8fe0222f979" - integrity sha512-MOqz5rIL3gZaABvGI5veMDZOl/8O+i5uJagmLpvjY9rau8tygJQ7t7pYHQEMlfQchNRb/m7p5WSgmvZ/R80BKw== +"@abp/jquery-form@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.5.tgz#a3a66b333c839f36af88808cf4588162fdf8237f" + integrity sha512-PotRlDmzxnG6zk8yAJCR6MthK5tWH6disgWPsCxl+UN6d470V24ei0ZWx/eN2YKxRnRYLrrdvbgH9OMM7Clq9g== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.4.tgz#7092b57d7362a4e201f82c41f4ef38edc50acf95" - integrity sha512-DUvT1jMt4YwML3oTXA369NaQGWVR2nDDf0J6RfHjzT1geSzJiquYN2PAZ7u/tPqQgbS62+HIvI+zbWZ1rNJ6XA== +"@abp/jquery-validation-unobtrusive@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.5.tgz#7796c2bb644ebdff18e2c74822570a710d0d863e" + integrity sha512-6YWYUfPfjf1fZIEWHR9wqzJuWI1hmrGnm9uILZ9o829pvqdC7ctqemv2+PwSYPDzTcmk5ys54NHcXcwq8/H/JA== dependencies: - "@abp/jquery-validation" "~7.4.0-rc.4" + "@abp/jquery-validation" "~7.4.0-rc.5" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.4.tgz#b74f2d0138b7caf46c0085e57fcdba92a917f55a" - integrity sha512-qaYmHUr6/d13LSXHII8XIE1MuVbBPswToKN7y0uw3joFcw7NyQCEOkAkTxpGy0V6uhP/4zbxs90SYkJfy60zww== +"@abp/jquery-validation@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.5.tgz#e27d2936d6dc0fb9182f1cf1f73019b2e1873b87" + integrity sha512-O1RSRI1UH8ZTMBTfkQG+LSvE+4W5W93Rw0bUJV8dI5lWT9cBuoQkWVLqOZqr9JX9ZMuYMf4GDyWYYT5MS4+EQQ== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" jquery-validation "^1.19.3" -"@abp/jquery@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.4.tgz#615c4a40b451cd526085a69335bc6f41ebe99223" - integrity sha512-fuU5bt4x2NBeJXOCEyfeDPo8UiVoKqgjuKvXLoiAvt+za5qGitRQuPbJAakDKVxGWa7idu/d/8oYLWEqWw3Luw== +"@abp/jquery@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.5.tgz#fb664d1706e2ff02f24bf910363ff8221a447b7c" + integrity sha512-o/bTJKO7g9H0NChDtgYanG049Zihmojlt86fNfJ5p0uCRAbkrLnUQfOqTw5NhtQAbPmNyR+pK6Tk9oKlN6/V0Q== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" jquery "~3.6.0" -"@abp/jstree@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jstree/-/jstree-7.4.0-rc.4.tgz#6c221e77ca43ecf3fa82ed74197096686e7acec5" - integrity sha512-M4Reb0XyjO07R3pcSKbGBam41Oz3x83Tz9qTVLqg0ulTpqaFB6Fny05yP/AoMohJ2EsogqYPOCo99QiTyeD+AQ== +"@abp/jstree@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jstree/-/jstree-7.4.0-rc.5.tgz#0b0bb7fba3f1504e15db8d3b8774f67b25abf876" + integrity sha512-URgK5LNBL3llGEToWpGvcHbenz0GA/TAl1S49PcUXNIiWMAVeb7i3fYJiun00lzjHOqwhBkTIbk1kyKLGHHHeA== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" jstree "^3.3.12" -"@abp/lodash@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.4.tgz#0c94552b4debf025afdfe636cca753169dbcba85" - integrity sha512-oWrSBwDRb7EfvnHiPYSLzIuwZ6rvm4j6yjtxIe1rQt4X9aWENVXUPtg6ZG59kpZGEAFcIC5xJcTNfkLui7Xorw== +"@abp/lodash@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.5.tgz#68123983a07f334230692a2a9750b0f3a9681000" + integrity sha512-MleBwBDXCg4pLyQVAU94/j5wPFhsZ3GU8UlBokhS8QXu4J444GyBH6DCes9VPFvAcKe0WJzCNe2wPn9GU2bmiA== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" lodash "^4.17.21" -"@abp/luxon@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.4.tgz#6c6247b5672bfd49ef64a3a3ea94aa74eeeeaae8" - integrity sha512-B2QYSAP8UInRoMEo+X9499s1VVDpjIbojTIqENufouGUqdRlDN+0ZJYHKmliQloQ1HZdGHOs0z8kFA4at+bsgQ== +"@abp/luxon@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.5.tgz#2a5ba7a7d43d35b8ed7e839b85518e26afe21890" + integrity sha512-E5PsSaLRwziJsi0OVBokZ7n1SCzBBQv25P9bc29aC0t8rjHNpkmhR7zHDF3XgUQSTiBWy35l69l+ZD9AEhm9ZA== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.4.tgz#7aacc70573587058a49f9d464c8fce8c030410d9" - integrity sha512-vhwf7J98/YbHLf8GykvmF7Ok8QGjzR5BTb5VHpZ22jTdEIPPv0dTvwkQJrcyGg4DHGOVECFL+FOTud89JWtYEQ== +"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.5.tgz#4aefd88adab0377d9fb25c2f41c7a30ce96e3655" + integrity sha512-/9kYE1Rq51kXGxA2Et+br4xV3WsXA9Z2AA/wEU16pxbOwu0biBOffZbLWhfqKoi//JVxZJuxm8sjrA4E7hpjcg== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.4.tgz#f2b10c654d057100efb9919d0c5ba56f6c73f719" - integrity sha512-EUmJVN4eb6q7+gn5ze+f+wftp4jRzBojUU/2IjfHq9BmpqMewGO4OS3gfvomXEnx5z3cNci8cOT9is5IQ8jpfw== +"@abp/moment@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.5.tgz#5bbc6fa78f9667253568e68936b6c8edea74d319" + integrity sha512-v46BvWM6pWLswUeYhYM+sw3UeC6k+y2a49czY1gsW/ydrj8O61pbxulzPW3CLeqN+10qq4S7tJr3lK/o0Igq7A== dependencies: moment "^2.9.0" -"@abp/prismjs@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-7.4.0-rc.4.tgz#e267cbfa5276bbe1b51de8f67df0ce9c1443ba63" - integrity sha512-PHFc5TtIHY51Idd+wmhG41IV8QSpeF1E4o+w9eMJInEA47pIzlaH0nNqbuoBQQsrlVhzTFJ2rACZw4z76eaxNw== +"@abp/prismjs@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-7.4.0-rc.5.tgz#9480d0907fa0a15ab55aa95c460b4fa2507acd65" + integrity sha512-Q7t/vZDcI4qMSuf1Ytp01vvyCa4M+yC8e7lQf5EG9lFsBUDVUhuv5vtRthsTbbCfoDJl4LrJ/BfWGpWvftG3aA== dependencies: - "@abp/clipboard" "~7.4.0-rc.4" - "@abp/core" "~7.4.0-rc.4" + "@abp/clipboard" "~7.4.0-rc.5" + "@abp/core" "~7.4.0-rc.5" prismjs "^1.26.0" -"@abp/select2@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.4.tgz#07a1336943af96434cb76b5178bd8344f09e5e25" - integrity sha512-yN4fq+a27zYMsOb5xGJHRxO/GM/ZiPPOK2VryB7dy8bLC/jlMWPiFIRQDR6HY7BMPVHTds4zIhJeH2kWP/vgdA== +"@abp/select2@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.5.tgz#7fa5d7bc578e5a13f1cb77eb3885fd10bc987356" + integrity sha512-czk5o1Ogd8l+qolisQ6jDdqOCIsl129pI0DQsWwn5f/FGyLAkzZ8CQt8mx04PE6R4mNLLFwcMspPuTyxONLwyg== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" select2 "^4.0.13" -"@abp/slugify@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/slugify/-/slugify-7.4.0-rc.4.tgz#afd70c6655d8216a00c32fdcea92587742e174c1" - integrity sha512-8M8prWvx+TfRWRPyzRhBagXs80IJST8rcEFK0MzPCT0zdYIRPQLV7EEVQtjCls63nAw2Nn7J6xifdXIPiauiiQ== +"@abp/slugify@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/slugify/-/slugify-7.4.0-rc.5.tgz#c71b5c09a96fa1b770ed0e9ea16c9aa03b5c154f" + integrity sha512-bEYGYtaqRIEG2icJaSlbVAekF7NjeNpiRp8es4uIbS3HoUXQkaSHw8YUoGegdK4YAUwC5UsgiQsbYhffgK/qQw== dependencies: slugify "^1.6.5" -"@abp/star-rating-svg@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-7.4.0-rc.4.tgz#4bed8cb50e23d9c540620d215908fba377790755" - integrity sha512-XklV0msBxgUyw4evNnfTwLo7jEfJdLSYLrDEhGtWMWkwjM6qi3L6828YLmuSLKvaZh4ovoFQQm6/hURuK6qdWg== +"@abp/star-rating-svg@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-7.4.0-rc.5.tgz#8553372a0a0cbe54a10c2ff8257bcd9c21b779c5" + integrity sha512-5qDMHbwu4odVXj58+IYrN98xuAyIvLNbtbKi4thqfIOtrqNS4uT/XyFl08Qmb/09Y9Ve+jq5a/UQWkG0XTTrug== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" star-rating-svg "^3.5.0" -"@abp/sweetalert2@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.4.tgz#9588a8b89850459ee78c1c1f4bd890ebe8a319f4" - integrity sha512-rJLtDiG8kmpcwPxTTdNlVeto53DeuE80O3j7x4A/qBGNo9bfL+g83nwwR8Y+GnT0pLaNB3132rUMBbfSPsSgOA== +"@abp/sweetalert2@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.5.tgz#8c05235d32460e0f590841fd5fddb66a5ec664ed" + integrity sha512-uQ4qKj4szRBv1AU06U7F6z8iRGJTAs0yrJZuAt287sz1uZTXWhlN9nvfIiG/1Z8VCNHHDp12oPyVZzKOM3PhbQ== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" sweetalert2 "^11.3.6" -"@abp/timeago@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.4.tgz#a1ebcb037d5593439af42c87772f65e414faf6c3" - integrity sha512-BYwRqozV187taz67LCX3PcbwL8WyqiQgOYDnS5m+HnfjngzgWcOvGQqG3eskI057xu04ZyjMUIhaIJpGT3QDsw== +"@abp/timeago@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.5.tgz#02dfa7b5d59e71e45a9d48595a242dc5f25f4e21" + integrity sha512-EA+pSCSSGYtYaQABfhYWsMoVqgVGz8Ykn6a7tVc34Z5qfPKucgGKfuppRmQOZVz9n8zp9W/94BnDF2kRfP+FEg== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" timeago "^1.6.7" -"@abp/toastr@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.4.tgz#71327a6549a7744534cf20fb3efe94ddc844738f" - integrity sha512-KEpMqPO9s8dnqLJeeyarS10g1LaNv2JKVYu3tjlhlquh9u14+2haE/RHXl0/KEhbkvqxosSc1AwhIcZD8eWyew== +"@abp/toastr@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.5.tgz#ba2a623083c1182f1a66a21b932a02bb1665111b" + integrity sha512-BkJjWtbnPHImKL5g8Xwak2y7XdGk62q2bYZ/vFtSUY033Lr/3ufQxlVX6pXumodhPIrus7xEyIerxLWg8tYyAQ== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" toastr "^2.1.4" -"@abp/tui-editor@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-7.4.0-rc.4.tgz#830e429aebd2f819a3f30a2dbe9384c8c7e058c5" - integrity sha512-opZEMuuCGxwmu0QuzfTZhJ8FlSH+e0z0q5lbo1ywu18w270c3xLY0qGfDEjyCRq+VahHi079k4BMKGwzBvzLow== +"@abp/tui-editor@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-7.4.0-rc.5.tgz#95bf2993c0bdc41de4737d6b9edb94fccccb595b" + integrity sha512-NySXrbAaA4ddgiGyYLbaTXlG0/oXm99+nJpCiLUPJNA5I+WzhUFx4X1FIsfP/80A8jiodHpKrt4DhqhVW4+ZJA== dependencies: - "@abp/jquery" "~7.4.0-rc.4" - "@abp/prismjs" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" + "@abp/prismjs" "~7.4.0-rc.5" -"@abp/uppy@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-7.4.0-rc.4.tgz#81a77314a526592b63d36211590ad095ca55ba23" - integrity sha512-TJ9hZrKVMIrNl0f0vNsNEOh3fu7it5EuJfwJCJ31ZDMTPPPw+6Eza/muhE1vl5lHw3pLxT7PgimHgA9R6Gv22g== +"@abp/uppy@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-7.4.0-rc.5.tgz#9b9056d53d237b098272cb39a49085d3acde9cd7" + integrity sha512-jrJEXHO8dPOyYA+Jz660wFF75tGW84Zi/N1/I4wx6IPs40BvHsTSApQ/lpIgYI53dF5afShj5cqPLTWEepHSOA== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" uppy "^1.16.1" -"@abp/utils@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.4.tgz#5f60a548e5cf15dadb9ab25a406ba26a323fff20" - integrity sha512-UEp+u6kMLbqn3lrB0lI0b59s9+mhWckH1Hmo5Lv+Pam9d8FFGYhxho3UyCWVN+oWj/6W/SXw8XzgQBv490APHA== +"@abp/utils@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.5.tgz#f52cde2297a2b33562ee291541ec66f2080eafbd" + integrity sha512-9kPPKaA5vUVUYArblfaIurAaWxeaOfM/Sc9yzDmNWOTQ7FSBhCEKeZbQvj1X+mNpOV4rxEvqZ19LbvJ6RZs+AA== dependencies: just-compare "^2.3.0" diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Tags/TagAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Tags/TagAdminAppService.cs index b30a2308e1..e1521d32c0 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Tags/TagAdminAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Tags/TagAdminAppService.cs @@ -92,7 +92,7 @@ public class TagAdminAppService : CmsKitAppServiceBase, ITagAdminAppService [Authorize(CmsKitAdminPermissions.Tags.Default)] public virtual async Task> GetListAsync(TagGetListInput input) { - var tags = await Repository.GetListAsync(input.Filter); + var tags = await Repository.GetListAsync(input.Filter, input.MaxResultCount, input.SkipCount, input.Sorting); var count = await Repository.GetCountAsync(input.Filter); return new PagedResultDto( diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Menus/CmsKitAdminMenuContributor.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Menus/CmsKitAdminMenuContributor.cs index 3621e5d564..b17e595442 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Menus/CmsKitAdminMenuContributor.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Menus/CmsKitAdminMenuContributor.cs @@ -97,7 +97,7 @@ public class CmsKitAdminMenuContributor : IMenuContributor CmsKitAdminMenus.GlobalResources.GlobalResourcesMenu, l["GlobalResources"], "/Cms/GlobalResources", - "bi bi-code-slash", + "fa fa-code", order: 4) .RequireFeatures(CmsKitFeatures.GlobalResourceEnable) .RequireGlobalFeatures(typeof(GlobalResourcesFeature)) diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/ITagRepository.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/ITagRepository.cs index d00457b53a..f6210d16f8 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/ITagRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/ITagRepository.cs @@ -26,6 +26,9 @@ public interface ITagRepository : IBasicRepository Task> GetListAsync( string filter, + int maxResultCount = int.MaxValue, + int skipCount = 0, + string sorting = null, CancellationToken cancellationToken = default); Task GetCountAsync( diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Tags/EfCoreTagRepository.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Tags/EfCoreTagRepository.cs index 2791f69f6a..9899c228e2 100644 --- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Tags/EfCoreTagRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Tags/EfCoreTagRepository.cs @@ -3,6 +3,7 @@ using Microsoft.EntityFrameworkCore; using System; using System.Collections.Generic; using System.Linq; +using System.Linq.Dynamic.Core; using System.Threading; using System.Threading.Tasks; using Volo.Abp; @@ -96,9 +97,16 @@ public class EfCoreTagRepository : EfCoreRepository .ToListAsync(cancellationToken: GetCancellationToken(cancellationToken)); } - public virtual async Task> GetListAsync(string filter, CancellationToken cancellationToken = default) + public virtual async Task> GetListAsync( + string filter, + int maxResultCount = int.MaxValue, + int skipCount = 0, + string sorting = null, + CancellationToken cancellationToken = default) { - return await (await GetQueryableByFilterAsync(filter)).ToListAsync(GetCancellationToken(cancellationToken)); + return await (await GetQueryableByFilterAsync(filter)) + .OrderBy(sorting.IsNullOrEmpty() ? $"{nameof(Tag.CreationTime)}" : sorting) + .PageBy(skipCount, maxResultCount).ToListAsync(GetCancellationToken(cancellationToken)); } public virtual async Task GetCountAsync(string filter, CancellationToken cancellationToken = default) diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Tags/MongoTagRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Tags/MongoTagRepository.cs index d8f938c3f6..e8f702dbb2 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Tags/MongoTagRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Tags/MongoTagRepository.cs @@ -4,6 +4,7 @@ using MongoDB.Driver.Linq; using System; using System.Collections.Generic; using System.Linq; +using System.Linq.Dynamic.Core; using System.Threading; using System.Threading.Tasks; using Volo.Abp; @@ -107,9 +108,17 @@ public class MongoTagRepository : MongoDbRepository> GetListAsync(string filter, CancellationToken cancellationToken = default) + public virtual async Task> GetListAsync(string filter, + int maxResultCount = int.MaxValue, + int skipCount = 0, + string sorting = null, + CancellationToken cancellationToken = default) { - return await (await GetQueryableByFilterAsync(filter, cancellationToken)).ToListAsync(GetCancellationToken(cancellationToken)); + return await (await GetQueryableByFilterAsync(filter, cancellationToken)) + .OrderBy(sorting.IsNullOrEmpty() ? $"{nameof(Tag.CreationTime)}" : sorting) + .As>() + .PageBy>(skipCount, maxResultCount) + .ToListAsync(GetCancellationToken(cancellationToken)); } public virtual async Task GetCountAsync(string filter, CancellationToken cancellationToken = default) diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs index 74177352be..93a61efe2f 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs @@ -73,13 +73,16 @@ public class CmsKitPublicWebModule : AbpModule options.KeyPrefix = "CmsKit:"; }); - Configure(options => + if (GlobalFeatureManager.Instance.IsEnabled()) { - options.EndpointConfigureActions.Add(context => + Configure(options => { - context.Endpoints.MapCmsPageRoute(); + options.EndpointConfigureActions.Add(context => + { + context.Endpoints.MapCmsPageRoute(); + }); }); - }); + } } public override void PostConfigureServices(ServiceConfigurationContext context) diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml index d55ffebad7..79e2dad802 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml @@ -1,4 +1,5 @@ -@page "/pages/{**slug}" +@page "/cmskit/page" + @addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap @using Volo.CmsKit.Contents @using Volo.CmsKit.Web.Pages.CmsKit.Components.Contents diff --git a/modules/docs/app/VoloDocs.Web/package.json b/modules/docs/app/VoloDocs.Web/package.json index 777703fed7..3e3775225e 100644 --- a/modules/docs/app/VoloDocs.Web/package.json +++ b/modules/docs/app/VoloDocs.Web/package.json @@ -3,7 +3,7 @@ "name": "volo.docstestapp", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.4", - "@abp/docs": "~7.4.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.5", + "@abp/docs": "~7.4.0-rc.5" } } diff --git a/modules/docs/app/VoloDocs.Web/yarn.lock b/modules/docs/app/VoloDocs.Web/yarn.lock index a1d41100a2..1f992413e5 100644 --- a/modules/docs/app/VoloDocs.Web/yarn.lock +++ b/modules/docs/app/VoloDocs.Web/yarn.lock @@ -2,47 +2,47 @@ # yarn lockfile v1 -"@abp/anchor-js@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/anchor-js/-/anchor-js-7.4.0-rc.4.tgz#115c3915f9c06bd89ba17c2c16250d917f4a71d6" - integrity sha512-74VbQ9cz7EB3dqTRLzTDlvxuaehiCORWKMhCpDBkvLDy2ovrXv40wsygWaDXYGojGxsjkxJeZNBqTdts6cLM9w== +"@abp/anchor-js@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/anchor-js/-/anchor-js-7.4.0-rc.5.tgz#1442d822c0dd80709c8572a4499842a9a04dd52a" + integrity sha512-uovzx8ohLfik98mAUE2DqnNeHRrTDTEpHCP7Wgpc93Orw2ozaz0sdrjlWdAv+PMv771waqhld6L0uYwIHSgMMA== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" anchor-js "^4.3.1" -"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.4.tgz#4b53752513bf727b4962093d8ff4daac66139718" - integrity sha512-Jj3faRxJdaaoJzPcyhJgb7/8+7oEK6rRY4R3uP5pF50khR/yNHWcLP6WCZ+LQZu7fKlEpiQ5EITiWRpP/5hf/w== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.4" - -"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.4.tgz#9f8b6c33c17da1c0bc0c596ef2fb9fe93248c7fb" - integrity sha512-lL6WWRSsrDIGBQl3tNFifLt08JEQycCrK0E57F3NquviFY/erducHp+dfJJ+s1OAadUlkvmsB5Scs8xQMQCaig== - dependencies: - "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.4" - "@abp/bootstrap" "~7.4.0-rc.4" - "@abp/bootstrap-datepicker" "~7.4.0-rc.4" - "@abp/bootstrap-daterangepicker" "~7.4.0-rc.4" - "@abp/datatables.net-bs5" "~7.4.0-rc.4" - "@abp/font-awesome" "~7.4.0-rc.4" - "@abp/jquery-form" "~7.4.0-rc.4" - "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.4" - "@abp/lodash" "~7.4.0-rc.4" - "@abp/luxon" "~7.4.0-rc.4" - "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.4" - "@abp/moment" "~7.4.0-rc.4" - "@abp/select2" "~7.4.0-rc.4" - "@abp/sweetalert2" "~7.4.0-rc.4" - "@abp/timeago" "~7.4.0-rc.4" - "@abp/toastr" "~7.4.0-rc.4" - -"@abp/aspnetcore.mvc.ui@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.4.tgz#3854183dea1a24dee42debc0a5413de0f08d3d0d" - integrity sha512-TTAnlbh8KcDWakMCtawHgrbcmoqvLdLxz1DDWUTkmCEQPImdrh52Jf1LNrL/771hug1dk5kqAuH5R5nBFGfnbA== +"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.5.tgz#20fb27493a42a88adf423862f79031a840fb741e" + integrity sha512-1pjQT+JWd+5Cqfzvt1CGii8Igd2YVpMd5vRYXkogKdjtJiElgaJwIbhjGMnV/neaSF2eR6y5g1SW6BP6NNN8yA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.5" + +"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.5.tgz#ebf4732a466ea187afb870571aea2862e278906a" + integrity sha512-EOtOHV9yEHX8dL0tSDTDQYXDVsNIuItDb5TpF30Jg8JIkz2xGnijXh71BmVb2QF7mZ2Q048BhAPc3s0i9cWU0g== + dependencies: + "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.5" + "@abp/bootstrap" "~7.4.0-rc.5" + "@abp/bootstrap-datepicker" "~7.4.0-rc.5" + "@abp/bootstrap-daterangepicker" "~7.4.0-rc.5" + "@abp/datatables.net-bs5" "~7.4.0-rc.5" + "@abp/font-awesome" "~7.4.0-rc.5" + "@abp/jquery-form" "~7.4.0-rc.5" + "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.5" + "@abp/lodash" "~7.4.0-rc.5" + "@abp/luxon" "~7.4.0-rc.5" + "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.5" + "@abp/moment" "~7.4.0-rc.5" + "@abp/select2" "~7.4.0-rc.5" + "@abp/sweetalert2" "~7.4.0-rc.5" + "@abp/timeago" "~7.4.0-rc.5" + "@abp/toastr" "~7.4.0-rc.5" + +"@abp/aspnetcore.mvc.ui@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.5.tgz#a71ff2736472b8028e09a6de1e998c9523c00f81" + integrity sha512-meoBTIfJ88Fp9HZKRTn9URXSMGGUioRIFr206VVE2pwOqO5lLKTbRkpeSM46uzLNoWRj+Rn4NDKdYdEsjWj1IQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -51,194 +51,194 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.4.tgz#2fe2c68d628383d1d8ff349dfb7da9b5b4eb04c1" - integrity sha512-C+vLaehe6lZhLPuJM5ZfwsHOqt3htOVpyjZvBwyX3DdXIwsLpg7nCvTPgtXbt1CNSJ3aePkbdQDEaLv603WRGw== +"@abp/bootstrap-datepicker@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.5.tgz#943ef8fb6bc984788f08a828a187495bc8fc3be8" + integrity sha512-bhBiHDichxIsqN8FyeFkViOyGnQyLs9RG+ZIRnM7l9zP+8m7InB+RFbRCi7IRLnNVoT9C+Fy5O9kOhTyd48dkg== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.4.tgz#d8b950f91d5963ef7725f2bc69b80c24b3626235" - integrity sha512-ehoqkI07UGc/MbhENOV7BkB67VNyRa8lYC9gBBlD+59VAsg1f3b/UzVJGnTvcPPPwA4SyJL56dDZbxj8uI1TAQ== +"@abp/bootstrap-daterangepicker@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.5.tgz#052393e99a181fe48814a86b3adb47e302ef1d50" + integrity sha512-N4gBrfOA9Jl9qcDo8EAgGI1SZHnQb7bFcAdW2rQlRhCYuhd89wR3RWqsljh+UwEBqu/LPzYMGTQ+TLdLHi2rug== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.4.tgz#794850366d0a85a6e2ad703590ad91f5616d50ad" - integrity sha512-+tcO/o1hnpiI8HPjnh5BGZn7NbVnQsKAgR5nJkZvHlVdsiFnufgtVfKoM0n7lalN/h0caCLbBxkS+OVrpTCv6Q== +"@abp/bootstrap@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.5.tgz#5718af8004ac3dc00c451cab07a4260ca0e45ac5" + integrity sha512-FAB+yeKXn+P0YuuzFYrBUAQSEIoIm7FSwxb13ouCRb17XgHXcSp2ikdPIMcctGnq/Af31WxfJjCWGLNVcZCCmw== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" bootstrap "^5.1.3" -"@abp/clipboard@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-7.4.0-rc.4.tgz#555f72dab99343520784cbb1cb3c6c50086500c0" - integrity sha512-p4Px63x5VaS7buwg/0TU26LIZ+LPAQOBAvlHWXl8QhvpdN5OjZPX+GyvEW4UkzcNbyoB7bn9bBUYRD1cDSmlzQ== +"@abp/clipboard@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-7.4.0-rc.5.tgz#54ca41b3284552a6595fda51caf12d715d3f64f5" + integrity sha512-1+XKIOPM77msa+xfWsFFZzLc450q2vq3/dDKSkFqKxj4PfnM5jqijoptG0k0EcBojOfTURESwREE1Xqjn3OjHg== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" clipboard "^2.0.8" -"@abp/core@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.4.tgz#4a2aebc67fdd1f9296d34c33cba7d3b5d5b186d6" - integrity sha512-nBEks/7mCqYEhvKZtda6bi56eh0hiVym+/VCe9D9YXSVuFAoudmN1KyBL1/HLrJOFYCenP8TQMXDxXg9Qv4ILQ== +"@abp/core@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.5.tgz#93eb68ac9828c4ce66355e651f194fcc5e171bf3" + integrity sha512-2oqRviXbS1Avuj63u/s8AjnLEuR4FvG+hpk81DA39hNiNPvwosG24Ie9nxaa0A5F7kcCEvRM7JAmc/0MQ7FJKg== dependencies: - "@abp/utils" "~7.4.0-rc.4" + "@abp/utils" "~7.4.0-rc.5" -"@abp/datatables.net-bs5@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.4.tgz#cc205cdee4d24e9b9059797443cb52996f42b431" - integrity sha512-DnKtYe9LgYfRAATQRlbs90jDH4KM6jbYIcXht/CibU8c/hGWXver/wk+13w4lMlzm+eDw/yJ1qNKfFTYMCXaBw== +"@abp/datatables.net-bs5@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.5.tgz#036e98a69c7bb51f56755b93912c00841ffc6e00" + integrity sha512-OZlNJynMFus4AxPMoCAfIE15X3PdGB5UwKJTi7XCza4Ok3F+mevmsIwOpjLqs1OpbLEIHK3Ftk6nXfTMpFZQpQ== dependencies: - "@abp/datatables.net" "~7.4.0-rc.4" + "@abp/datatables.net" "~7.4.0-rc.5" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.4.tgz#eb9458cd0f0c1f1de9321bb2e637357e67ac68d9" - integrity sha512-OipmXFl4b//5agl+zIhhDT9tpt/QLcd6Ux+Ual8Wavh2YuGU7KDgCBWPN9W9McCfyExtejjp1H0epk6rl/EMXg== +"@abp/datatables.net@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.5.tgz#32fa40f3a1f397faf06b25e3653cdfb74256a2e5" + integrity sha512-grRRJfrDZz4v8t0QP1/bXlDNcZpWdcxLI4MsHORekt9EXrWx2iWtcZt4yhs7GLhX2swc6VuNf3OCO8/S5obQpQ== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" datatables.net "^1.11.4" -"@abp/docs@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/docs/-/docs-7.4.0-rc.4.tgz#8dbd79930a48149972abdcc87f0a03982b16997c" - integrity sha512-YYQv7Eg7TJrOg5lU1ihVbDoT4cjHbYt/uyyZjITfdM4erFhqV4AG8sFWhdNxPcAV1gKkiQe4D+TYbajflBmcZA== +"@abp/docs@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/docs/-/docs-7.4.0-rc.5.tgz#8f29e98cd1f36bea17bdb48d38cb63e6fc0cf2a2" + integrity sha512-pwGS+93WfSaIcp70jMDgX0oW1RbGV0r2OijHb4QjDqVThHBUX777yKXC3Nhnz57HegXTb16D0weufSK0P8K3xA== dependencies: - "@abp/anchor-js" "~7.4.0-rc.4" - "@abp/clipboard" "~7.4.0-rc.4" - "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.4" - "@abp/popper.js" "~7.4.0-rc.4" - "@abp/prismjs" "~7.4.0-rc.4" + "@abp/anchor-js" "~7.4.0-rc.5" + "@abp/clipboard" "~7.4.0-rc.5" + "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.5" + "@abp/popper.js" "~7.4.0-rc.5" + "@abp/prismjs" "~7.4.0-rc.5" -"@abp/font-awesome@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.4.tgz#720c32147bc5590b52911121a01a5f951ca09092" - integrity sha512-6gmsa42ernWVU8jfUl+ZpoSnSbr9Gc8nhl+cMKwo7AkbPvtMhR/tnH0v+4/0wJl+SWelvXeTWL7OHi3ZmFsNgA== +"@abp/font-awesome@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.5.tgz#1171b3556eac71894083bfe0776dd170783d8f17" + integrity sha512-UUJZ2Q7pYag4j6C83ElV7z3eG72HthpJW/RQ4/rMjoeW5Dbduomuihx0WtDqtoNmsYdjH7Z0nWUhKzRUv3Yo9Q== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.4.tgz#669f9adda562867e8db075718577c8fe0222f979" - integrity sha512-MOqz5rIL3gZaABvGI5veMDZOl/8O+i5uJagmLpvjY9rau8tygJQ7t7pYHQEMlfQchNRb/m7p5WSgmvZ/R80BKw== +"@abp/jquery-form@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.5.tgz#a3a66b333c839f36af88808cf4588162fdf8237f" + integrity sha512-PotRlDmzxnG6zk8yAJCR6MthK5tWH6disgWPsCxl+UN6d470V24ei0ZWx/eN2YKxRnRYLrrdvbgH9OMM7Clq9g== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.4.tgz#7092b57d7362a4e201f82c41f4ef38edc50acf95" - integrity sha512-DUvT1jMt4YwML3oTXA369NaQGWVR2nDDf0J6RfHjzT1geSzJiquYN2PAZ7u/tPqQgbS62+HIvI+zbWZ1rNJ6XA== +"@abp/jquery-validation-unobtrusive@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.5.tgz#7796c2bb644ebdff18e2c74822570a710d0d863e" + integrity sha512-6YWYUfPfjf1fZIEWHR9wqzJuWI1hmrGnm9uILZ9o829pvqdC7ctqemv2+PwSYPDzTcmk5ys54NHcXcwq8/H/JA== dependencies: - "@abp/jquery-validation" "~7.4.0-rc.4" + "@abp/jquery-validation" "~7.4.0-rc.5" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.4.tgz#b74f2d0138b7caf46c0085e57fcdba92a917f55a" - integrity sha512-qaYmHUr6/d13LSXHII8XIE1MuVbBPswToKN7y0uw3joFcw7NyQCEOkAkTxpGy0V6uhP/4zbxs90SYkJfy60zww== +"@abp/jquery-validation@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.5.tgz#e27d2936d6dc0fb9182f1cf1f73019b2e1873b87" + integrity sha512-O1RSRI1UH8ZTMBTfkQG+LSvE+4W5W93Rw0bUJV8dI5lWT9cBuoQkWVLqOZqr9JX9ZMuYMf4GDyWYYT5MS4+EQQ== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" jquery-validation "^1.19.3" -"@abp/jquery@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.4.tgz#615c4a40b451cd526085a69335bc6f41ebe99223" - integrity sha512-fuU5bt4x2NBeJXOCEyfeDPo8UiVoKqgjuKvXLoiAvt+za5qGitRQuPbJAakDKVxGWa7idu/d/8oYLWEqWw3Luw== +"@abp/jquery@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.5.tgz#fb664d1706e2ff02f24bf910363ff8221a447b7c" + integrity sha512-o/bTJKO7g9H0NChDtgYanG049Zihmojlt86fNfJ5p0uCRAbkrLnUQfOqTw5NhtQAbPmNyR+pK6Tk9oKlN6/V0Q== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" jquery "~3.6.0" -"@abp/lodash@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.4.tgz#0c94552b4debf025afdfe636cca753169dbcba85" - integrity sha512-oWrSBwDRb7EfvnHiPYSLzIuwZ6rvm4j6yjtxIe1rQt4X9aWENVXUPtg6ZG59kpZGEAFcIC5xJcTNfkLui7Xorw== +"@abp/lodash@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.5.tgz#68123983a07f334230692a2a9750b0f3a9681000" + integrity sha512-MleBwBDXCg4pLyQVAU94/j5wPFhsZ3GU8UlBokhS8QXu4J444GyBH6DCes9VPFvAcKe0WJzCNe2wPn9GU2bmiA== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" lodash "^4.17.21" -"@abp/luxon@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.4.tgz#6c6247b5672bfd49ef64a3a3ea94aa74eeeeaae8" - integrity sha512-B2QYSAP8UInRoMEo+X9499s1VVDpjIbojTIqENufouGUqdRlDN+0ZJYHKmliQloQ1HZdGHOs0z8kFA4at+bsgQ== +"@abp/luxon@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.5.tgz#2a5ba7a7d43d35b8ed7e839b85518e26afe21890" + integrity sha512-E5PsSaLRwziJsi0OVBokZ7n1SCzBBQv25P9bc29aC0t8rjHNpkmhR7zHDF3XgUQSTiBWy35l69l+ZD9AEhm9ZA== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.4.tgz#7aacc70573587058a49f9d464c8fce8c030410d9" - integrity sha512-vhwf7J98/YbHLf8GykvmF7Ok8QGjzR5BTb5VHpZ22jTdEIPPv0dTvwkQJrcyGg4DHGOVECFL+FOTud89JWtYEQ== +"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.5.tgz#4aefd88adab0377d9fb25c2f41c7a30ce96e3655" + integrity sha512-/9kYE1Rq51kXGxA2Et+br4xV3WsXA9Z2AA/wEU16pxbOwu0biBOffZbLWhfqKoi//JVxZJuxm8sjrA4E7hpjcg== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.4.tgz#f2b10c654d057100efb9919d0c5ba56f6c73f719" - integrity sha512-EUmJVN4eb6q7+gn5ze+f+wftp4jRzBojUU/2IjfHq9BmpqMewGO4OS3gfvomXEnx5z3cNci8cOT9is5IQ8jpfw== +"@abp/moment@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.5.tgz#5bbc6fa78f9667253568e68936b6c8edea74d319" + integrity sha512-v46BvWM6pWLswUeYhYM+sw3UeC6k+y2a49czY1gsW/ydrj8O61pbxulzPW3CLeqN+10qq4S7tJr3lK/o0Igq7A== dependencies: moment "^2.9.0" -"@abp/popper.js@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/popper.js/-/popper.js-7.4.0-rc.4.tgz#13c32f419f60f8a9d16819d28136678089de21eb" - integrity sha512-pqpiKApPMbVFJIrZPYFFqfytY0rRoe467r/sSWGMvO1llQ62NuLgLXkzqqiL0crbNOm0bz0Uw3rYotc7z5q3og== +"@abp/popper.js@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/popper.js/-/popper.js-7.4.0-rc.5.tgz#bbc195763f7dbc74bca27e18eb3eae04d1410d11" + integrity sha512-r0N55vVVqy4L3f8bdk5nXmzfyjOGZFBbHQfyCdkdI6/XOLlyo5brmNceqxsEen6CaYdNv5tvHlfDo53pzlV35Q== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" "@popperjs/core" "^2.11.2" -"@abp/prismjs@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-7.4.0-rc.4.tgz#e267cbfa5276bbe1b51de8f67df0ce9c1443ba63" - integrity sha512-PHFc5TtIHY51Idd+wmhG41IV8QSpeF1E4o+w9eMJInEA47pIzlaH0nNqbuoBQQsrlVhzTFJ2rACZw4z76eaxNw== +"@abp/prismjs@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-7.4.0-rc.5.tgz#9480d0907fa0a15ab55aa95c460b4fa2507acd65" + integrity sha512-Q7t/vZDcI4qMSuf1Ytp01vvyCa4M+yC8e7lQf5EG9lFsBUDVUhuv5vtRthsTbbCfoDJl4LrJ/BfWGpWvftG3aA== dependencies: - "@abp/clipboard" "~7.4.0-rc.4" - "@abp/core" "~7.4.0-rc.4" + "@abp/clipboard" "~7.4.0-rc.5" + "@abp/core" "~7.4.0-rc.5" prismjs "^1.26.0" -"@abp/select2@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.4.tgz#07a1336943af96434cb76b5178bd8344f09e5e25" - integrity sha512-yN4fq+a27zYMsOb5xGJHRxO/GM/ZiPPOK2VryB7dy8bLC/jlMWPiFIRQDR6HY7BMPVHTds4zIhJeH2kWP/vgdA== +"@abp/select2@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.5.tgz#7fa5d7bc578e5a13f1cb77eb3885fd10bc987356" + integrity sha512-czk5o1Ogd8l+qolisQ6jDdqOCIsl129pI0DQsWwn5f/FGyLAkzZ8CQt8mx04PE6R4mNLLFwcMspPuTyxONLwyg== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" select2 "^4.0.13" -"@abp/sweetalert2@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.4.tgz#9588a8b89850459ee78c1c1f4bd890ebe8a319f4" - integrity sha512-rJLtDiG8kmpcwPxTTdNlVeto53DeuE80O3j7x4A/qBGNo9bfL+g83nwwR8Y+GnT0pLaNB3132rUMBbfSPsSgOA== +"@abp/sweetalert2@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.5.tgz#8c05235d32460e0f590841fd5fddb66a5ec664ed" + integrity sha512-uQ4qKj4szRBv1AU06U7F6z8iRGJTAs0yrJZuAt287sz1uZTXWhlN9nvfIiG/1Z8VCNHHDp12oPyVZzKOM3PhbQ== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" sweetalert2 "^11.3.6" -"@abp/timeago@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.4.tgz#a1ebcb037d5593439af42c87772f65e414faf6c3" - integrity sha512-BYwRqozV187taz67LCX3PcbwL8WyqiQgOYDnS5m+HnfjngzgWcOvGQqG3eskI057xu04ZyjMUIhaIJpGT3QDsw== +"@abp/timeago@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.5.tgz#02dfa7b5d59e71e45a9d48595a242dc5f25f4e21" + integrity sha512-EA+pSCSSGYtYaQABfhYWsMoVqgVGz8Ykn6a7tVc34Z5qfPKucgGKfuppRmQOZVz9n8zp9W/94BnDF2kRfP+FEg== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" timeago "^1.6.7" -"@abp/toastr@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.4.tgz#71327a6549a7744534cf20fb3efe94ddc844738f" - integrity sha512-KEpMqPO9s8dnqLJeeyarS10g1LaNv2JKVYu3tjlhlquh9u14+2haE/RHXl0/KEhbkvqxosSc1AwhIcZD8eWyew== +"@abp/toastr@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.5.tgz#ba2a623083c1182f1a66a21b932a02bb1665111b" + integrity sha512-BkJjWtbnPHImKL5g8Xwak2y7XdGk62q2bYZ/vFtSUY033Lr/3ufQxlVX6pXumodhPIrus7xEyIerxLWg8tYyAQ== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" toastr "^2.1.4" -"@abp/utils@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.4.tgz#5f60a548e5cf15dadb9ab25a406ba26a323fff20" - integrity sha512-UEp+u6kMLbqn3lrB0lI0b59s9+mhWckH1Hmo5Lv+Pam9d8FFGYhxho3UyCWVN+oWj/6W/SXw8XzgQBv490APHA== +"@abp/utils@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.5.tgz#f52cde2297a2b33562ee291541ec66f2080eafbd" + integrity sha512-9kPPKaA5vUVUYArblfaIurAaWxeaOfM/Sc9yzDmNWOTQ7FSBhCEKeZbQvj1X+mNpOV4rxEvqZ19LbvJ6RZs+AA== dependencies: just-compare "^2.3.0" diff --git a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs index c52902bfed..6f3eb540f2 100644 --- a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs +++ b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs @@ -188,11 +188,11 @@ public class EfCoreIdentityUserRepository : EfCoreRepository identityUser.Roles.Any(x => x.RoleId == roleId.Value)) .WhereIf(organizationUnitId.HasValue, identityUser => identityUser.OrganizationUnits.Any(x => x.OrganizationUnitId == organizationUnitId.Value)) - .WhereIf(!string.IsNullOrWhiteSpace(userName), x => x.UserName == userName) - .WhereIf(!string.IsNullOrWhiteSpace(phoneNumber), x => x.PhoneNumber == phoneNumber) - .WhereIf(!string.IsNullOrWhiteSpace(emailAddress), x => x.Email == emailAddress) - .WhereIf(!string.IsNullOrWhiteSpace(name), x => x.Name == name) - .WhereIf(!string.IsNullOrWhiteSpace(surname), x => x.Surname == surname) + .WhereIf(!string.IsNullOrWhiteSpace(userName), x => x.UserName.Contains(userName)) + .WhereIf(!string.IsNullOrWhiteSpace(phoneNumber), x => x.PhoneNumber.Contains(phoneNumber)) + .WhereIf(!string.IsNullOrWhiteSpace(emailAddress), x => x.Email.Contains(emailAddress)) + .WhereIf(!string.IsNullOrWhiteSpace(name), x => x.Name.Contains(name)) + .WhereIf(!string.IsNullOrWhiteSpace(surname), x => x.Surname.Contains(surname)) .WhereIf(isLockedOut.HasValue, x => (x.LockoutEnabled && x.LockoutEnd.HasValue && x.LockoutEnd.Value.CompareTo(DateTime.UtcNow) > 0) == isLockedOut.Value) .WhereIf(notActive.HasValue, x => x.IsActive == !notActive.Value) .WhereIf(emailConfirmed.HasValue, x => x.EmailConfirmed == emailConfirmed.Value) diff --git a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreOrganizationUnitRepository.cs b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreOrganizationUnitRepository.cs index cd2e2af595..9a766ed1c9 100644 --- a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreOrganizationUnitRepository.cs +++ b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreOrganizationUnitRepository.cs @@ -40,7 +40,7 @@ public class EfCoreOrganizationUnitRepository { return await (await GetDbSetAsync()) .IncludeDetails(includeDetails) - .Where(ou => ou.Code.StartsWith(code) && ou.Id != parentId.Value) + .Where(ou => ou.Code.StartsWith(code) && ou.Id != parentId) .ToListAsync(GetCancellationToken(cancellationToken)); } diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs index 51960edbba..255e492c05 100644 --- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs +++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs @@ -168,11 +168,11 @@ public class MongoIdentityUserRepository : MongoDbRepository>(roleId.HasValue, identityUser => identityUser.Roles.Any(x => x.RoleId == roleId.Value)) .WhereIf>(organizationUnitId.HasValue, identityUser => identityUser.OrganizationUnits.Any(x => x.OrganizationUnitId == organizationUnitId.Value)) - .WhereIf>(!string.IsNullOrWhiteSpace(userName), x => x.UserName == userName) - .WhereIf>(!string.IsNullOrWhiteSpace(phoneNumber), x => x.PhoneNumber == phoneNumber) - .WhereIf>(!string.IsNullOrWhiteSpace(emailAddress), x => x.Email == emailAddress) - .WhereIf>(!string.IsNullOrWhiteSpace(name), x => x.Name == name) - .WhereIf>(!string.IsNullOrWhiteSpace(surname), x => x.Surname == surname) + .WhereIf>(!string.IsNullOrWhiteSpace(userName), x => x.UserName.Contains(userName)) + .WhereIf>(!string.IsNullOrWhiteSpace(phoneNumber), x => x.PhoneNumber.Contains(phoneNumber)) + .WhereIf>(!string.IsNullOrWhiteSpace(emailAddress), x => x.Email.Contains(emailAddress)) + .WhereIf>(!string.IsNullOrWhiteSpace(name), x => x.Name.Contains(name)) + .WhereIf>(!string.IsNullOrWhiteSpace(surname), x => x.Surname.Contains(surname)) .WhereIf>(isLockedOut.HasValue && isLockedOut.Value, x => x.LockoutEnabled && x.LockoutEnd != null && x.LockoutEnd > DateTimeOffset.UtcNow) .WhereIf>(isLockedOut.HasValue && !isLockedOut.Value, x => !(x.LockoutEnabled && x.LockoutEnd != null && x.LockoutEnd > DateTimeOffset.UtcNow)) .WhereIf>(notActive.HasValue, x => x.IsActive == !notActive.Value) diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoOrganizationUnitRepository.cs b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoOrganizationUnitRepository.cs index 23726693ad..728696ada8 100644 --- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoOrganizationUnitRepository.cs +++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoOrganizationUnitRepository.cs @@ -39,7 +39,7 @@ public class MongoOrganizationUnitRepository CancellationToken cancellationToken = default) { return await (await GetMongoQueryableAsync(cancellationToken)) - .Where(ou => ou.Code.StartsWith(code) && ou.Id != parentId.Value) + .Where(ou => ou.Code.StartsWith(code) && ou.Id != parentId) .ToListAsync(GetCancellationToken(cancellationToken)); } diff --git a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/OrganizationUnitRepository_Tests.cs b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/OrganizationUnitRepository_Tests.cs index be757d5008..9ff41f2385 100644 --- a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/OrganizationUnitRepository_Tests.cs +++ b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/OrganizationUnitRepository_Tests.cs @@ -47,8 +47,13 @@ public abstract class OrganizationUnitRepository_Tests : AbpIden [Fact] public async Task GetAllChildrenWithParentCodeAsync() { - (await _organizationUnitRepository.GetAllChildrenWithParentCodeAsync(OrganizationUnit.CreateCode(0), - _guidGenerator.Create())).ShouldNotBeNull(); + var allChildren = await _organizationUnitRepository.GetAllChildrenWithParentCodeAsync(OrganizationUnit.CreateCode(0), _guidGenerator.Create()); + allChildren.ShouldNotBeNull(); + allChildren.ShouldBeEmpty(); + + allChildren = (await _organizationUnitRepository.GetAllChildrenWithParentCodeAsync(OrganizationUnit.CreateCode(1), null)); + allChildren.ShouldNotBeNull(); + allChildren.ShouldNotBeEmpty(); } [Fact] diff --git a/modules/openiddict/app/OpenIddict.Demo.Server/package.json b/modules/openiddict/app/OpenIddict.Demo.Server/package.json index 704a94ab02..d821bb0862 100644 --- a/modules/openiddict/app/OpenIddict.Demo.Server/package.json +++ b/modules/openiddict/app/OpenIddict.Demo.Server/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.5" } } diff --git a/modules/openiddict/app/angular/package.json b/modules/openiddict/app/angular/package.json index 9891205adb..b057d350aa 100644 --- a/modules/openiddict/app/angular/package.json +++ b/modules/openiddict/app/angular/package.json @@ -12,15 +12,15 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~7.4.0-rc.4", - "@abp/ng.components": "~7.4.0-rc.4", - "@abp/ng.core": "~7.4.0-rc.4", - "@abp/ng.oauth": "~7.4.0-rc.4", - "@abp/ng.identity": "~7.4.0-rc.4", - "@abp/ng.setting-management": "~7.4.0-rc.4", - "@abp/ng.tenant-management": "~7.4.0-rc.4", - "@abp/ng.theme.shared": "~7.4.0-rc.4", - "@abp/ng.theme.lepton-x": "~2.4.0-rc.2", + "@abp/ng.account": "~7.4.0-rc.5", + "@abp/ng.components": "~7.4.0-rc.5", + "@abp/ng.core": "~7.4.0-rc.5", + "@abp/ng.oauth": "~7.4.0-rc.5", + "@abp/ng.identity": "~7.4.0-rc.5", + "@abp/ng.setting-management": "~7.4.0-rc.5", + "@abp/ng.tenant-management": "~7.4.0-rc.5", + "@abp/ng.theme.shared": "~7.4.0-rc.5", + "@abp/ng.theme.lepton-x": "~2.4.0-rc.4", "@angular/animations": "^15.0.1", "@angular/common": "^15.0.1", "@angular/compiler": "^15.0.1", @@ -36,7 +36,7 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@abp/ng.schematics": "~7.4.0-rc.4", + "@abp/ng.schematics": "~7.4.0-rc.5", "@angular-devkit/build-angular": "^15.0.1", "@angular-eslint/builder": "~15.1.0", "@angular-eslint/eslint-plugin": "~15.1.0", diff --git a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json index 727acf59ed..3b5ea8d3db 100644 --- a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json +++ b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json @@ -3,6 +3,6 @@ "name": "demo-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.5" } } diff --git a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock index 739bb79d1c..8e55b67a23 100644 --- a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock +++ b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock @@ -2,39 +2,39 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.4.tgz#4b53752513bf727b4962093d8ff4daac66139718" - integrity sha512-Jj3faRxJdaaoJzPcyhJgb7/8+7oEK6rRY4R3uP5pF50khR/yNHWcLP6WCZ+LQZu7fKlEpiQ5EITiWRpP/5hf/w== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.4" - -"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.4.tgz#9f8b6c33c17da1c0bc0c596ef2fb9fe93248c7fb" - integrity sha512-lL6WWRSsrDIGBQl3tNFifLt08JEQycCrK0E57F3NquviFY/erducHp+dfJJ+s1OAadUlkvmsB5Scs8xQMQCaig== - dependencies: - "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.4" - "@abp/bootstrap" "~7.4.0-rc.4" - "@abp/bootstrap-datepicker" "~7.4.0-rc.4" - "@abp/bootstrap-daterangepicker" "~7.4.0-rc.4" - "@abp/datatables.net-bs5" "~7.4.0-rc.4" - "@abp/font-awesome" "~7.4.0-rc.4" - "@abp/jquery-form" "~7.4.0-rc.4" - "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.4" - "@abp/lodash" "~7.4.0-rc.4" - "@abp/luxon" "~7.4.0-rc.4" - "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.4" - "@abp/moment" "~7.4.0-rc.4" - "@abp/select2" "~7.4.0-rc.4" - "@abp/sweetalert2" "~7.4.0-rc.4" - "@abp/timeago" "~7.4.0-rc.4" - "@abp/toastr" "~7.4.0-rc.4" - -"@abp/aspnetcore.mvc.ui@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.4.tgz#3854183dea1a24dee42debc0a5413de0f08d3d0d" - integrity sha512-TTAnlbh8KcDWakMCtawHgrbcmoqvLdLxz1DDWUTkmCEQPImdrh52Jf1LNrL/771hug1dk5kqAuH5R5nBFGfnbA== +"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.5.tgz#20fb27493a42a88adf423862f79031a840fb741e" + integrity sha512-1pjQT+JWd+5Cqfzvt1CGii8Igd2YVpMd5vRYXkogKdjtJiElgaJwIbhjGMnV/neaSF2eR6y5g1SW6BP6NNN8yA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.5" + +"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.5.tgz#ebf4732a466ea187afb870571aea2862e278906a" + integrity sha512-EOtOHV9yEHX8dL0tSDTDQYXDVsNIuItDb5TpF30Jg8JIkz2xGnijXh71BmVb2QF7mZ2Q048BhAPc3s0i9cWU0g== + dependencies: + "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.5" + "@abp/bootstrap" "~7.4.0-rc.5" + "@abp/bootstrap-datepicker" "~7.4.0-rc.5" + "@abp/bootstrap-daterangepicker" "~7.4.0-rc.5" + "@abp/datatables.net-bs5" "~7.4.0-rc.5" + "@abp/font-awesome" "~7.4.0-rc.5" + "@abp/jquery-form" "~7.4.0-rc.5" + "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.5" + "@abp/lodash" "~7.4.0-rc.5" + "@abp/luxon" "~7.4.0-rc.5" + "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.5" + "@abp/moment" "~7.4.0-rc.5" + "@abp/select2" "~7.4.0-rc.5" + "@abp/sweetalert2" "~7.4.0-rc.5" + "@abp/timeago" "~7.4.0-rc.5" + "@abp/toastr" "~7.4.0-rc.5" + +"@abp/aspnetcore.mvc.ui@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.5.tgz#a71ff2736472b8028e09a6de1e998c9523c00f81" + integrity sha512-meoBTIfJ88Fp9HZKRTn9URXSMGGUioRIFr206VVE2pwOqO5lLKTbRkpeSM46uzLNoWRj+Rn4NDKdYdEsjWj1IQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,158 +43,158 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.4.tgz#2fe2c68d628383d1d8ff349dfb7da9b5b4eb04c1" - integrity sha512-C+vLaehe6lZhLPuJM5ZfwsHOqt3htOVpyjZvBwyX3DdXIwsLpg7nCvTPgtXbt1CNSJ3aePkbdQDEaLv603WRGw== +"@abp/bootstrap-datepicker@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.5.tgz#943ef8fb6bc984788f08a828a187495bc8fc3be8" + integrity sha512-bhBiHDichxIsqN8FyeFkViOyGnQyLs9RG+ZIRnM7l9zP+8m7InB+RFbRCi7IRLnNVoT9C+Fy5O9kOhTyd48dkg== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.4.tgz#d8b950f91d5963ef7725f2bc69b80c24b3626235" - integrity sha512-ehoqkI07UGc/MbhENOV7BkB67VNyRa8lYC9gBBlD+59VAsg1f3b/UzVJGnTvcPPPwA4SyJL56dDZbxj8uI1TAQ== +"@abp/bootstrap-daterangepicker@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.5.tgz#052393e99a181fe48814a86b3adb47e302ef1d50" + integrity sha512-N4gBrfOA9Jl9qcDo8EAgGI1SZHnQb7bFcAdW2rQlRhCYuhd89wR3RWqsljh+UwEBqu/LPzYMGTQ+TLdLHi2rug== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.4.tgz#794850366d0a85a6e2ad703590ad91f5616d50ad" - integrity sha512-+tcO/o1hnpiI8HPjnh5BGZn7NbVnQsKAgR5nJkZvHlVdsiFnufgtVfKoM0n7lalN/h0caCLbBxkS+OVrpTCv6Q== +"@abp/bootstrap@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.5.tgz#5718af8004ac3dc00c451cab07a4260ca0e45ac5" + integrity sha512-FAB+yeKXn+P0YuuzFYrBUAQSEIoIm7FSwxb13ouCRb17XgHXcSp2ikdPIMcctGnq/Af31WxfJjCWGLNVcZCCmw== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" bootstrap "^5.1.3" -"@abp/core@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.4.tgz#4a2aebc67fdd1f9296d34c33cba7d3b5d5b186d6" - integrity sha512-nBEks/7mCqYEhvKZtda6bi56eh0hiVym+/VCe9D9YXSVuFAoudmN1KyBL1/HLrJOFYCenP8TQMXDxXg9Qv4ILQ== +"@abp/core@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.5.tgz#93eb68ac9828c4ce66355e651f194fcc5e171bf3" + integrity sha512-2oqRviXbS1Avuj63u/s8AjnLEuR4FvG+hpk81DA39hNiNPvwosG24Ie9nxaa0A5F7kcCEvRM7JAmc/0MQ7FJKg== dependencies: - "@abp/utils" "~7.4.0-rc.4" + "@abp/utils" "~7.4.0-rc.5" -"@abp/datatables.net-bs5@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.4.tgz#cc205cdee4d24e9b9059797443cb52996f42b431" - integrity sha512-DnKtYe9LgYfRAATQRlbs90jDH4KM6jbYIcXht/CibU8c/hGWXver/wk+13w4lMlzm+eDw/yJ1qNKfFTYMCXaBw== +"@abp/datatables.net-bs5@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.5.tgz#036e98a69c7bb51f56755b93912c00841ffc6e00" + integrity sha512-OZlNJynMFus4AxPMoCAfIE15X3PdGB5UwKJTi7XCza4Ok3F+mevmsIwOpjLqs1OpbLEIHK3Ftk6nXfTMpFZQpQ== dependencies: - "@abp/datatables.net" "~7.4.0-rc.4" + "@abp/datatables.net" "~7.4.0-rc.5" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.4.tgz#eb9458cd0f0c1f1de9321bb2e637357e67ac68d9" - integrity sha512-OipmXFl4b//5agl+zIhhDT9tpt/QLcd6Ux+Ual8Wavh2YuGU7KDgCBWPN9W9McCfyExtejjp1H0epk6rl/EMXg== +"@abp/datatables.net@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.5.tgz#32fa40f3a1f397faf06b25e3653cdfb74256a2e5" + integrity sha512-grRRJfrDZz4v8t0QP1/bXlDNcZpWdcxLI4MsHORekt9EXrWx2iWtcZt4yhs7GLhX2swc6VuNf3OCO8/S5obQpQ== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" datatables.net "^1.11.4" -"@abp/font-awesome@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.4.tgz#720c32147bc5590b52911121a01a5f951ca09092" - integrity sha512-6gmsa42ernWVU8jfUl+ZpoSnSbr9Gc8nhl+cMKwo7AkbPvtMhR/tnH0v+4/0wJl+SWelvXeTWL7OHi3ZmFsNgA== +"@abp/font-awesome@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.5.tgz#1171b3556eac71894083bfe0776dd170783d8f17" + integrity sha512-UUJZ2Q7pYag4j6C83ElV7z3eG72HthpJW/RQ4/rMjoeW5Dbduomuihx0WtDqtoNmsYdjH7Z0nWUhKzRUv3Yo9Q== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.4.tgz#669f9adda562867e8db075718577c8fe0222f979" - integrity sha512-MOqz5rIL3gZaABvGI5veMDZOl/8O+i5uJagmLpvjY9rau8tygJQ7t7pYHQEMlfQchNRb/m7p5WSgmvZ/R80BKw== +"@abp/jquery-form@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.5.tgz#a3a66b333c839f36af88808cf4588162fdf8237f" + integrity sha512-PotRlDmzxnG6zk8yAJCR6MthK5tWH6disgWPsCxl+UN6d470V24ei0ZWx/eN2YKxRnRYLrrdvbgH9OMM7Clq9g== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.4.tgz#7092b57d7362a4e201f82c41f4ef38edc50acf95" - integrity sha512-DUvT1jMt4YwML3oTXA369NaQGWVR2nDDf0J6RfHjzT1geSzJiquYN2PAZ7u/tPqQgbS62+HIvI+zbWZ1rNJ6XA== +"@abp/jquery-validation-unobtrusive@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.5.tgz#7796c2bb644ebdff18e2c74822570a710d0d863e" + integrity sha512-6YWYUfPfjf1fZIEWHR9wqzJuWI1hmrGnm9uILZ9o829pvqdC7ctqemv2+PwSYPDzTcmk5ys54NHcXcwq8/H/JA== dependencies: - "@abp/jquery-validation" "~7.4.0-rc.4" + "@abp/jquery-validation" "~7.4.0-rc.5" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.4.tgz#b74f2d0138b7caf46c0085e57fcdba92a917f55a" - integrity sha512-qaYmHUr6/d13LSXHII8XIE1MuVbBPswToKN7y0uw3joFcw7NyQCEOkAkTxpGy0V6uhP/4zbxs90SYkJfy60zww== +"@abp/jquery-validation@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.5.tgz#e27d2936d6dc0fb9182f1cf1f73019b2e1873b87" + integrity sha512-O1RSRI1UH8ZTMBTfkQG+LSvE+4W5W93Rw0bUJV8dI5lWT9cBuoQkWVLqOZqr9JX9ZMuYMf4GDyWYYT5MS4+EQQ== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" jquery-validation "^1.19.3" -"@abp/jquery@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.4.tgz#615c4a40b451cd526085a69335bc6f41ebe99223" - integrity sha512-fuU5bt4x2NBeJXOCEyfeDPo8UiVoKqgjuKvXLoiAvt+za5qGitRQuPbJAakDKVxGWa7idu/d/8oYLWEqWw3Luw== +"@abp/jquery@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.5.tgz#fb664d1706e2ff02f24bf910363ff8221a447b7c" + integrity sha512-o/bTJKO7g9H0NChDtgYanG049Zihmojlt86fNfJ5p0uCRAbkrLnUQfOqTw5NhtQAbPmNyR+pK6Tk9oKlN6/V0Q== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" jquery "~3.6.0" -"@abp/lodash@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.4.tgz#0c94552b4debf025afdfe636cca753169dbcba85" - integrity sha512-oWrSBwDRb7EfvnHiPYSLzIuwZ6rvm4j6yjtxIe1rQt4X9aWENVXUPtg6ZG59kpZGEAFcIC5xJcTNfkLui7Xorw== +"@abp/lodash@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.5.tgz#68123983a07f334230692a2a9750b0f3a9681000" + integrity sha512-MleBwBDXCg4pLyQVAU94/j5wPFhsZ3GU8UlBokhS8QXu4J444GyBH6DCes9VPFvAcKe0WJzCNe2wPn9GU2bmiA== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" lodash "^4.17.21" -"@abp/luxon@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.4.tgz#6c6247b5672bfd49ef64a3a3ea94aa74eeeeaae8" - integrity sha512-B2QYSAP8UInRoMEo+X9499s1VVDpjIbojTIqENufouGUqdRlDN+0ZJYHKmliQloQ1HZdGHOs0z8kFA4at+bsgQ== +"@abp/luxon@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.5.tgz#2a5ba7a7d43d35b8ed7e839b85518e26afe21890" + integrity sha512-E5PsSaLRwziJsi0OVBokZ7n1SCzBBQv25P9bc29aC0t8rjHNpkmhR7zHDF3XgUQSTiBWy35l69l+ZD9AEhm9ZA== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.4.tgz#7aacc70573587058a49f9d464c8fce8c030410d9" - integrity sha512-vhwf7J98/YbHLf8GykvmF7Ok8QGjzR5BTb5VHpZ22jTdEIPPv0dTvwkQJrcyGg4DHGOVECFL+FOTud89JWtYEQ== +"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.5.tgz#4aefd88adab0377d9fb25c2f41c7a30ce96e3655" + integrity sha512-/9kYE1Rq51kXGxA2Et+br4xV3WsXA9Z2AA/wEU16pxbOwu0biBOffZbLWhfqKoi//JVxZJuxm8sjrA4E7hpjcg== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.4.tgz#f2b10c654d057100efb9919d0c5ba56f6c73f719" - integrity sha512-EUmJVN4eb6q7+gn5ze+f+wftp4jRzBojUU/2IjfHq9BmpqMewGO4OS3gfvomXEnx5z3cNci8cOT9is5IQ8jpfw== +"@abp/moment@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.5.tgz#5bbc6fa78f9667253568e68936b6c8edea74d319" + integrity sha512-v46BvWM6pWLswUeYhYM+sw3UeC6k+y2a49czY1gsW/ydrj8O61pbxulzPW3CLeqN+10qq4S7tJr3lK/o0Igq7A== dependencies: moment "^2.9.0" -"@abp/select2@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.4.tgz#07a1336943af96434cb76b5178bd8344f09e5e25" - integrity sha512-yN4fq+a27zYMsOb5xGJHRxO/GM/ZiPPOK2VryB7dy8bLC/jlMWPiFIRQDR6HY7BMPVHTds4zIhJeH2kWP/vgdA== +"@abp/select2@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.5.tgz#7fa5d7bc578e5a13f1cb77eb3885fd10bc987356" + integrity sha512-czk5o1Ogd8l+qolisQ6jDdqOCIsl129pI0DQsWwn5f/FGyLAkzZ8CQt8mx04PE6R4mNLLFwcMspPuTyxONLwyg== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" select2 "^4.0.13" -"@abp/sweetalert2@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.4.tgz#9588a8b89850459ee78c1c1f4bd890ebe8a319f4" - integrity sha512-rJLtDiG8kmpcwPxTTdNlVeto53DeuE80O3j7x4A/qBGNo9bfL+g83nwwR8Y+GnT0pLaNB3132rUMBbfSPsSgOA== +"@abp/sweetalert2@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.5.tgz#8c05235d32460e0f590841fd5fddb66a5ec664ed" + integrity sha512-uQ4qKj4szRBv1AU06U7F6z8iRGJTAs0yrJZuAt287sz1uZTXWhlN9nvfIiG/1Z8VCNHHDp12oPyVZzKOM3PhbQ== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" sweetalert2 "^11.3.6" -"@abp/timeago@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.4.tgz#a1ebcb037d5593439af42c87772f65e414faf6c3" - integrity sha512-BYwRqozV187taz67LCX3PcbwL8WyqiQgOYDnS5m+HnfjngzgWcOvGQqG3eskI057xu04ZyjMUIhaIJpGT3QDsw== +"@abp/timeago@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.5.tgz#02dfa7b5d59e71e45a9d48595a242dc5f25f4e21" + integrity sha512-EA+pSCSSGYtYaQABfhYWsMoVqgVGz8Ykn6a7tVc34Z5qfPKucgGKfuppRmQOZVz9n8zp9W/94BnDF2kRfP+FEg== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" timeago "^1.6.7" -"@abp/toastr@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.4.tgz#71327a6549a7744534cf20fb3efe94ddc844738f" - integrity sha512-KEpMqPO9s8dnqLJeeyarS10g1LaNv2JKVYu3tjlhlquh9u14+2haE/RHXl0/KEhbkvqxosSc1AwhIcZD8eWyew== +"@abp/toastr@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.5.tgz#ba2a623083c1182f1a66a21b932a02bb1665111b" + integrity sha512-BkJjWtbnPHImKL5g8Xwak2y7XdGk62q2bYZ/vFtSUY033Lr/3ufQxlVX6pXumodhPIrus7xEyIerxLWg8tYyAQ== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" toastr "^2.1.4" -"@abp/utils@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.4.tgz#5f60a548e5cf15dadb9ab25a406ba26a323fff20" - integrity sha512-UEp+u6kMLbqn3lrB0lI0b59s9+mhWckH1Hmo5Lv+Pam9d8FFGYhxho3UyCWVN+oWj/6W/SXw8XzgQBv490APHA== +"@abp/utils@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.5.tgz#f52cde2297a2b33562ee291541ec66f2080eafbd" + integrity sha512-9kPPKaA5vUVUYArblfaIurAaWxeaOfM/Sc9yzDmNWOTQ7FSBhCEKeZbQvj1X+mNpOV4rxEvqZ19LbvJ6RZs+AA== dependencies: just-compare "^2.3.0" diff --git a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json index 95676c765e..0140390eb9 100644 --- a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json +++ b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.4", - "@abp/virtual-file-explorer": "~7.4.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.5", + "@abp/virtual-file-explorer": "~7.4.0-rc.5" } } diff --git a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock index 62673456fe..6d5e25b564 100644 --- a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock +++ b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock @@ -2,39 +2,39 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.4.tgz#4b53752513bf727b4962093d8ff4daac66139718" - integrity sha512-Jj3faRxJdaaoJzPcyhJgb7/8+7oEK6rRY4R3uP5pF50khR/yNHWcLP6WCZ+LQZu7fKlEpiQ5EITiWRpP/5hf/w== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.4" - -"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.4.tgz#9f8b6c33c17da1c0bc0c596ef2fb9fe93248c7fb" - integrity sha512-lL6WWRSsrDIGBQl3tNFifLt08JEQycCrK0E57F3NquviFY/erducHp+dfJJ+s1OAadUlkvmsB5Scs8xQMQCaig== - dependencies: - "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.4" - "@abp/bootstrap" "~7.4.0-rc.4" - "@abp/bootstrap-datepicker" "~7.4.0-rc.4" - "@abp/bootstrap-daterangepicker" "~7.4.0-rc.4" - "@abp/datatables.net-bs5" "~7.4.0-rc.4" - "@abp/font-awesome" "~7.4.0-rc.4" - "@abp/jquery-form" "~7.4.0-rc.4" - "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.4" - "@abp/lodash" "~7.4.0-rc.4" - "@abp/luxon" "~7.4.0-rc.4" - "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.4" - "@abp/moment" "~7.4.0-rc.4" - "@abp/select2" "~7.4.0-rc.4" - "@abp/sweetalert2" "~7.4.0-rc.4" - "@abp/timeago" "~7.4.0-rc.4" - "@abp/toastr" "~7.4.0-rc.4" - -"@abp/aspnetcore.mvc.ui@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.4.tgz#3854183dea1a24dee42debc0a5413de0f08d3d0d" - integrity sha512-TTAnlbh8KcDWakMCtawHgrbcmoqvLdLxz1DDWUTkmCEQPImdrh52Jf1LNrL/771hug1dk5kqAuH5R5nBFGfnbA== +"@abp/aspnetcore.mvc.ui.theme.basic@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.4.0-rc.5.tgz#20fb27493a42a88adf423862f79031a840fb741e" + integrity sha512-1pjQT+JWd+5Cqfzvt1CGii8Igd2YVpMd5vRYXkogKdjtJiElgaJwIbhjGMnV/neaSF2eR6y5g1SW6BP6NNN8yA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~7.4.0-rc.5" + +"@abp/aspnetcore.mvc.ui.theme.shared@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.4.0-rc.5.tgz#ebf4732a466ea187afb870571aea2862e278906a" + integrity sha512-EOtOHV9yEHX8dL0tSDTDQYXDVsNIuItDb5TpF30Jg8JIkz2xGnijXh71BmVb2QF7mZ2Q048BhAPc3s0i9cWU0g== + dependencies: + "@abp/aspnetcore.mvc.ui" "~7.4.0-rc.5" + "@abp/bootstrap" "~7.4.0-rc.5" + "@abp/bootstrap-datepicker" "~7.4.0-rc.5" + "@abp/bootstrap-daterangepicker" "~7.4.0-rc.5" + "@abp/datatables.net-bs5" "~7.4.0-rc.5" + "@abp/font-awesome" "~7.4.0-rc.5" + "@abp/jquery-form" "~7.4.0-rc.5" + "@abp/jquery-validation-unobtrusive" "~7.4.0-rc.5" + "@abp/lodash" "~7.4.0-rc.5" + "@abp/luxon" "~7.4.0-rc.5" + "@abp/malihu-custom-scrollbar-plugin" "~7.4.0-rc.5" + "@abp/moment" "~7.4.0-rc.5" + "@abp/select2" "~7.4.0-rc.5" + "@abp/sweetalert2" "~7.4.0-rc.5" + "@abp/timeago" "~7.4.0-rc.5" + "@abp/toastr" "~7.4.0-rc.5" + +"@abp/aspnetcore.mvc.ui@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.4.0-rc.5.tgz#a71ff2736472b8028e09a6de1e998c9523c00f81" + integrity sha512-meoBTIfJ88Fp9HZKRTn9URXSMGGUioRIFr206VVE2pwOqO5lLKTbRkpeSM46uzLNoWRj+Rn4NDKdYdEsjWj1IQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,185 +43,185 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.4.tgz#2fe2c68d628383d1d8ff349dfb7da9b5b4eb04c1" - integrity sha512-C+vLaehe6lZhLPuJM5ZfwsHOqt3htOVpyjZvBwyX3DdXIwsLpg7nCvTPgtXbt1CNSJ3aePkbdQDEaLv603WRGw== +"@abp/bootstrap-datepicker@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.4.0-rc.5.tgz#943ef8fb6bc984788f08a828a187495bc8fc3be8" + integrity sha512-bhBiHDichxIsqN8FyeFkViOyGnQyLs9RG+ZIRnM7l9zP+8m7InB+RFbRCi7IRLnNVoT9C+Fy5O9kOhTyd48dkg== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.4.tgz#d8b950f91d5963ef7725f2bc69b80c24b3626235" - integrity sha512-ehoqkI07UGc/MbhENOV7BkB67VNyRa8lYC9gBBlD+59VAsg1f3b/UzVJGnTvcPPPwA4SyJL56dDZbxj8uI1TAQ== +"@abp/bootstrap-daterangepicker@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.4.0-rc.5.tgz#052393e99a181fe48814a86b3adb47e302ef1d50" + integrity sha512-N4gBrfOA9Jl9qcDo8EAgGI1SZHnQb7bFcAdW2rQlRhCYuhd89wR3RWqsljh+UwEBqu/LPzYMGTQ+TLdLHi2rug== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.4.tgz#794850366d0a85a6e2ad703590ad91f5616d50ad" - integrity sha512-+tcO/o1hnpiI8HPjnh5BGZn7NbVnQsKAgR5nJkZvHlVdsiFnufgtVfKoM0n7lalN/h0caCLbBxkS+OVrpTCv6Q== +"@abp/bootstrap@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-7.4.0-rc.5.tgz#5718af8004ac3dc00c451cab07a4260ca0e45ac5" + integrity sha512-FAB+yeKXn+P0YuuzFYrBUAQSEIoIm7FSwxb13ouCRb17XgHXcSp2ikdPIMcctGnq/Af31WxfJjCWGLNVcZCCmw== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" bootstrap "^5.1.3" -"@abp/clipboard@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-7.4.0-rc.4.tgz#555f72dab99343520784cbb1cb3c6c50086500c0" - integrity sha512-p4Px63x5VaS7buwg/0TU26LIZ+LPAQOBAvlHWXl8QhvpdN5OjZPX+GyvEW4UkzcNbyoB7bn9bBUYRD1cDSmlzQ== +"@abp/clipboard@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-7.4.0-rc.5.tgz#54ca41b3284552a6595fda51caf12d715d3f64f5" + integrity sha512-1+XKIOPM77msa+xfWsFFZzLc450q2vq3/dDKSkFqKxj4PfnM5jqijoptG0k0EcBojOfTURESwREE1Xqjn3OjHg== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" clipboard "^2.0.8" -"@abp/core@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.4.tgz#4a2aebc67fdd1f9296d34c33cba7d3b5d5b186d6" - integrity sha512-nBEks/7mCqYEhvKZtda6bi56eh0hiVym+/VCe9D9YXSVuFAoudmN1KyBL1/HLrJOFYCenP8TQMXDxXg9Qv4ILQ== +"@abp/core@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-7.4.0-rc.5.tgz#93eb68ac9828c4ce66355e651f194fcc5e171bf3" + integrity sha512-2oqRviXbS1Avuj63u/s8AjnLEuR4FvG+hpk81DA39hNiNPvwosG24Ie9nxaa0A5F7kcCEvRM7JAmc/0MQ7FJKg== dependencies: - "@abp/utils" "~7.4.0-rc.4" + "@abp/utils" "~7.4.0-rc.5" -"@abp/datatables.net-bs5@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.4.tgz#cc205cdee4d24e9b9059797443cb52996f42b431" - integrity sha512-DnKtYe9LgYfRAATQRlbs90jDH4KM6jbYIcXht/CibU8c/hGWXver/wk+13w4lMlzm+eDw/yJ1qNKfFTYMCXaBw== +"@abp/datatables.net-bs5@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.4.0-rc.5.tgz#036e98a69c7bb51f56755b93912c00841ffc6e00" + integrity sha512-OZlNJynMFus4AxPMoCAfIE15X3PdGB5UwKJTi7XCza4Ok3F+mevmsIwOpjLqs1OpbLEIHK3Ftk6nXfTMpFZQpQ== dependencies: - "@abp/datatables.net" "~7.4.0-rc.4" + "@abp/datatables.net" "~7.4.0-rc.5" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.4.tgz#eb9458cd0f0c1f1de9321bb2e637357e67ac68d9" - integrity sha512-OipmXFl4b//5agl+zIhhDT9tpt/QLcd6Ux+Ual8Wavh2YuGU7KDgCBWPN9W9McCfyExtejjp1H0epk6rl/EMXg== +"@abp/datatables.net@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-7.4.0-rc.5.tgz#32fa40f3a1f397faf06b25e3653cdfb74256a2e5" + integrity sha512-grRRJfrDZz4v8t0QP1/bXlDNcZpWdcxLI4MsHORekt9EXrWx2iWtcZt4yhs7GLhX2swc6VuNf3OCO8/S5obQpQ== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" datatables.net "^1.11.4" -"@abp/font-awesome@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.4.tgz#720c32147bc5590b52911121a01a5f951ca09092" - integrity sha512-6gmsa42ernWVU8jfUl+ZpoSnSbr9Gc8nhl+cMKwo7AkbPvtMhR/tnH0v+4/0wJl+SWelvXeTWL7OHi3ZmFsNgA== +"@abp/font-awesome@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-7.4.0-rc.5.tgz#1171b3556eac71894083bfe0776dd170783d8f17" + integrity sha512-UUJZ2Q7pYag4j6C83ElV7z3eG72HthpJW/RQ4/rMjoeW5Dbduomuihx0WtDqtoNmsYdjH7Z0nWUhKzRUv3Yo9Q== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.4.tgz#669f9adda562867e8db075718577c8fe0222f979" - integrity sha512-MOqz5rIL3gZaABvGI5veMDZOl/8O+i5uJagmLpvjY9rau8tygJQ7t7pYHQEMlfQchNRb/m7p5WSgmvZ/R80BKw== +"@abp/jquery-form@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-7.4.0-rc.5.tgz#a3a66b333c839f36af88808cf4588162fdf8237f" + integrity sha512-PotRlDmzxnG6zk8yAJCR6MthK5tWH6disgWPsCxl+UN6d470V24ei0ZWx/eN2YKxRnRYLrrdvbgH9OMM7Clq9g== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.4.tgz#7092b57d7362a4e201f82c41f4ef38edc50acf95" - integrity sha512-DUvT1jMt4YwML3oTXA369NaQGWVR2nDDf0J6RfHjzT1geSzJiquYN2PAZ7u/tPqQgbS62+HIvI+zbWZ1rNJ6XA== +"@abp/jquery-validation-unobtrusive@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.4.0-rc.5.tgz#7796c2bb644ebdff18e2c74822570a710d0d863e" + integrity sha512-6YWYUfPfjf1fZIEWHR9wqzJuWI1hmrGnm9uILZ9o829pvqdC7ctqemv2+PwSYPDzTcmk5ys54NHcXcwq8/H/JA== dependencies: - "@abp/jquery-validation" "~7.4.0-rc.4" + "@abp/jquery-validation" "~7.4.0-rc.5" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.4.tgz#b74f2d0138b7caf46c0085e57fcdba92a917f55a" - integrity sha512-qaYmHUr6/d13LSXHII8XIE1MuVbBPswToKN7y0uw3joFcw7NyQCEOkAkTxpGy0V6uhP/4zbxs90SYkJfy60zww== +"@abp/jquery-validation@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-7.4.0-rc.5.tgz#e27d2936d6dc0fb9182f1cf1f73019b2e1873b87" + integrity sha512-O1RSRI1UH8ZTMBTfkQG+LSvE+4W5W93Rw0bUJV8dI5lWT9cBuoQkWVLqOZqr9JX9ZMuYMf4GDyWYYT5MS4+EQQ== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" jquery-validation "^1.19.3" -"@abp/jquery@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.4.tgz#615c4a40b451cd526085a69335bc6f41ebe99223" - integrity sha512-fuU5bt4x2NBeJXOCEyfeDPo8UiVoKqgjuKvXLoiAvt+za5qGitRQuPbJAakDKVxGWa7idu/d/8oYLWEqWw3Luw== +"@abp/jquery@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-7.4.0-rc.5.tgz#fb664d1706e2ff02f24bf910363ff8221a447b7c" + integrity sha512-o/bTJKO7g9H0NChDtgYanG049Zihmojlt86fNfJ5p0uCRAbkrLnUQfOqTw5NhtQAbPmNyR+pK6Tk9oKlN6/V0Q== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" jquery "~3.6.0" -"@abp/lodash@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.4.tgz#0c94552b4debf025afdfe636cca753169dbcba85" - integrity sha512-oWrSBwDRb7EfvnHiPYSLzIuwZ6rvm4j6yjtxIe1rQt4X9aWENVXUPtg6ZG59kpZGEAFcIC5xJcTNfkLui7Xorw== +"@abp/lodash@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-7.4.0-rc.5.tgz#68123983a07f334230692a2a9750b0f3a9681000" + integrity sha512-MleBwBDXCg4pLyQVAU94/j5wPFhsZ3GU8UlBokhS8QXu4J444GyBH6DCes9VPFvAcKe0WJzCNe2wPn9GU2bmiA== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" lodash "^4.17.21" -"@abp/luxon@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.4.tgz#6c6247b5672bfd49ef64a3a3ea94aa74eeeeaae8" - integrity sha512-B2QYSAP8UInRoMEo+X9499s1VVDpjIbojTIqENufouGUqdRlDN+0ZJYHKmliQloQ1HZdGHOs0z8kFA4at+bsgQ== +"@abp/luxon@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-7.4.0-rc.5.tgz#2a5ba7a7d43d35b8ed7e839b85518e26afe21890" + integrity sha512-E5PsSaLRwziJsi0OVBokZ7n1SCzBBQv25P9bc29aC0t8rjHNpkmhR7zHDF3XgUQSTiBWy35l69l+ZD9AEhm9ZA== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.4.tgz#7aacc70573587058a49f9d464c8fce8c030410d9" - integrity sha512-vhwf7J98/YbHLf8GykvmF7Ok8QGjzR5BTb5VHpZ22jTdEIPPv0dTvwkQJrcyGg4DHGOVECFL+FOTud89JWtYEQ== +"@abp/malihu-custom-scrollbar-plugin@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.4.0-rc.5.tgz#4aefd88adab0377d9fb25c2f41c7a30ce96e3655" + integrity sha512-/9kYE1Rq51kXGxA2Et+br4xV3WsXA9Z2AA/wEU16pxbOwu0biBOffZbLWhfqKoi//JVxZJuxm8sjrA4E7hpjcg== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.4.tgz#f2b10c654d057100efb9919d0c5ba56f6c73f719" - integrity sha512-EUmJVN4eb6q7+gn5ze+f+wftp4jRzBojUU/2IjfHq9BmpqMewGO4OS3gfvomXEnx5z3cNci8cOT9is5IQ8jpfw== +"@abp/moment@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-7.4.0-rc.5.tgz#5bbc6fa78f9667253568e68936b6c8edea74d319" + integrity sha512-v46BvWM6pWLswUeYhYM+sw3UeC6k+y2a49czY1gsW/ydrj8O61pbxulzPW3CLeqN+10qq4S7tJr3lK/o0Igq7A== dependencies: moment "^2.9.0" -"@abp/prismjs@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-7.4.0-rc.4.tgz#e267cbfa5276bbe1b51de8f67df0ce9c1443ba63" - integrity sha512-PHFc5TtIHY51Idd+wmhG41IV8QSpeF1E4o+w9eMJInEA47pIzlaH0nNqbuoBQQsrlVhzTFJ2rACZw4z76eaxNw== +"@abp/prismjs@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-7.4.0-rc.5.tgz#9480d0907fa0a15ab55aa95c460b4fa2507acd65" + integrity sha512-Q7t/vZDcI4qMSuf1Ytp01vvyCa4M+yC8e7lQf5EG9lFsBUDVUhuv5vtRthsTbbCfoDJl4LrJ/BfWGpWvftG3aA== dependencies: - "@abp/clipboard" "~7.4.0-rc.4" - "@abp/core" "~7.4.0-rc.4" + "@abp/clipboard" "~7.4.0-rc.5" + "@abp/core" "~7.4.0-rc.5" prismjs "^1.26.0" -"@abp/select2@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.4.tgz#07a1336943af96434cb76b5178bd8344f09e5e25" - integrity sha512-yN4fq+a27zYMsOb5xGJHRxO/GM/ZiPPOK2VryB7dy8bLC/jlMWPiFIRQDR6HY7BMPVHTds4zIhJeH2kWP/vgdA== +"@abp/select2@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-7.4.0-rc.5.tgz#7fa5d7bc578e5a13f1cb77eb3885fd10bc987356" + integrity sha512-czk5o1Ogd8l+qolisQ6jDdqOCIsl129pI0DQsWwn5f/FGyLAkzZ8CQt8mx04PE6R4mNLLFwcMspPuTyxONLwyg== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" select2 "^4.0.13" -"@abp/sweetalert2@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.4.tgz#9588a8b89850459ee78c1c1f4bd890ebe8a319f4" - integrity sha512-rJLtDiG8kmpcwPxTTdNlVeto53DeuE80O3j7x4A/qBGNo9bfL+g83nwwR8Y+GnT0pLaNB3132rUMBbfSPsSgOA== +"@abp/sweetalert2@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-7.4.0-rc.5.tgz#8c05235d32460e0f590841fd5fddb66a5ec664ed" + integrity sha512-uQ4qKj4szRBv1AU06U7F6z8iRGJTAs0yrJZuAt287sz1uZTXWhlN9nvfIiG/1Z8VCNHHDp12oPyVZzKOM3PhbQ== dependencies: - "@abp/core" "~7.4.0-rc.4" + "@abp/core" "~7.4.0-rc.5" sweetalert2 "^11.3.6" -"@abp/timeago@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.4.tgz#a1ebcb037d5593439af42c87772f65e414faf6c3" - integrity sha512-BYwRqozV187taz67LCX3PcbwL8WyqiQgOYDnS5m+HnfjngzgWcOvGQqG3eskI057xu04ZyjMUIhaIJpGT3QDsw== +"@abp/timeago@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-7.4.0-rc.5.tgz#02dfa7b5d59e71e45a9d48595a242dc5f25f4e21" + integrity sha512-EA+pSCSSGYtYaQABfhYWsMoVqgVGz8Ykn6a7tVc34Z5qfPKucgGKfuppRmQOZVz9n8zp9W/94BnDF2kRfP+FEg== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" timeago "^1.6.7" -"@abp/toastr@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.4.tgz#71327a6549a7744534cf20fb3efe94ddc844738f" - integrity sha512-KEpMqPO9s8dnqLJeeyarS10g1LaNv2JKVYu3tjlhlquh9u14+2haE/RHXl0/KEhbkvqxosSc1AwhIcZD8eWyew== +"@abp/toastr@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-7.4.0-rc.5.tgz#ba2a623083c1182f1a66a21b932a02bb1665111b" + integrity sha512-BkJjWtbnPHImKL5g8Xwak2y7XdGk62q2bYZ/vFtSUY033Lr/3ufQxlVX6pXumodhPIrus7xEyIerxLWg8tYyAQ== dependencies: - "@abp/jquery" "~7.4.0-rc.4" + "@abp/jquery" "~7.4.0-rc.5" toastr "^2.1.4" -"@abp/utils@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.4.tgz#5f60a548e5cf15dadb9ab25a406ba26a323fff20" - integrity sha512-UEp+u6kMLbqn3lrB0lI0b59s9+mhWckH1Hmo5Lv+Pam9d8FFGYhxho3UyCWVN+oWj/6W/SXw8XzgQBv490APHA== +"@abp/utils@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-7.4.0-rc.5.tgz#f52cde2297a2b33562ee291541ec66f2080eafbd" + integrity sha512-9kPPKaA5vUVUYArblfaIurAaWxeaOfM/Sc9yzDmNWOTQ7FSBhCEKeZbQvj1X+mNpOV4rxEvqZ19LbvJ6RZs+AA== dependencies: just-compare "^2.3.0" -"@abp/virtual-file-explorer@~7.4.0-rc.4": - version "7.4.0-rc.4" - resolved "https://registry.yarnpkg.com/@abp/virtual-file-explorer/-/virtual-file-explorer-7.4.0-rc.4.tgz#4a47fc551baa243de9cea13a65591ea73dcd18b6" - integrity sha512-e1xM/AQls7WhUVmJjV04BEeoMRtwfJTP1FHZi+/LHud1cRwmuz7+HfvPuwwOMPZDPd8xWQrk/h9VPZ5tQCEdHg== +"@abp/virtual-file-explorer@~7.4.0-rc.5": + version "7.4.0-rc.5" + resolved "https://registry.yarnpkg.com/@abp/virtual-file-explorer/-/virtual-file-explorer-7.4.0-rc.5.tgz#3ace94c92165f3d89eab5569c2b67f818d7899c7" + integrity sha512-fOdQKmhmyuBiygxiBKJbpieW27OxWqxtdOi91VxIG71hODNl3LLeD19+Z0SQM9LY1eE7ylxZ+ofvrIUIFOKUVg== dependencies: - "@abp/clipboard" "~7.4.0-rc.4" - "@abp/prismjs" "~7.4.0-rc.4" + "@abp/clipboard" "~7.4.0-rc.5" + "@abp/prismjs" "~7.4.0-rc.5" "@fortawesome/fontawesome-free@^5.15.4": version "5.15.4" diff --git a/npm/lerna.json b/npm/lerna.json index 55103cca1a..e06e7e0a51 100644 --- a/npm/lerna.json +++ b/npm/lerna.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "packages": [ "packs/*" ], diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 8f29c351cc..1107acfb58 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -44,20 +44,20 @@ }, "private": true, "devDependencies": { - "@abp/ng.account": "~7.4.0-rc.4", - "@abp/ng.account.core": "~7.4.0-rc.4", - "@abp/ng.core": "~7.4.0-rc.4", - "@abp/ng.feature-management": "~7.4.0-rc.4", - "@abp/ng.identity": "~7.4.0-rc.4", - "@abp/ng.oauth": "~7.4.0-rc.4", - "@abp/ng.permission-management": "~7.4.0-rc.4", - "@abp/ng.schematics": "~7.4.0-rc.4", - "@abp/ng.setting-management": "~7.4.0-rc.4", - "@abp/ng.tenant-management": "~7.4.0-rc.4", - "@abp/ng.theme.basic": "~7.4.0-rc.4", - "@abp/ng.theme.lepton-x": "^2.4.0-rc.2", - "@abp/ng.theme.shared": "~7.4.0-rc.4", - "@abp/utils": "~7.4.0-rc.4", + "@abp/ng.account": "~7.4.0-rc.5", + "@abp/ng.account.core": "~7.4.0-rc.5", + "@abp/ng.core": "~7.4.0-rc.5", + "@abp/ng.feature-management": "~7.4.0-rc.5", + "@abp/ng.identity": "~7.4.0-rc.5", + "@abp/ng.oauth": "~7.4.0-rc.5", + "@abp/ng.permission-management": "~7.4.0-rc.5", + "@abp/ng.schematics": "~7.4.0-rc.5", + "@abp/ng.setting-management": "~7.4.0-rc.5", + "@abp/ng.tenant-management": "~7.4.0-rc.5", + "@abp/ng.theme.basic": "~7.4.0-rc.5", + "@abp/ng.theme.lepton-x": "^2.4.0-rc.4", + "@abp/ng.theme.shared": "~7.4.0-rc.5", + "@abp/utils": "~7.4.0-rc.5", "@angular-devkit/build-angular": "~16.0.0", "@angular-devkit/core": "~16.0.0", "@angular-devkit/schematics": "~16.0.0", diff --git a/npm/ng-packs/packages/account-core/package.json b/npm/ng-packs/packages/account-core/package.json index 1126eb58de..dc0f4f4db9 100644 --- a/npm/ng-packs/packages/account-core/package.json +++ b/npm/ng-packs/packages/account-core/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.account.core", - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "peerDependencies": { - "@abp/ng.core": "~7.4.0-rc.4", - "@abp/ng.theme.shared": "~7.4.0-rc.4", + "@abp/ng.core": "~7.4.0-rc.5", + "@abp/ng.theme.shared": "~7.4.0-rc.5", "@angular/common": ">=12.0.0", "@angular/core": ">=12.0.0" }, diff --git a/npm/ng-packs/packages/account/package.json b/npm/ng-packs/packages/account/package.json index bf0ccd17a0..613e6ead29 100644 --- a/npm/ng-packs/packages/account/package.json +++ b/npm/ng-packs/packages/account/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.account", - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.account.core": "~7.4.0-rc.4", - "@abp/ng.theme.shared": "~7.4.0-rc.4", + "@abp/ng.account.core": "~7.4.0-rc.5", + "@abp/ng.theme.shared": "~7.4.0-rc.5", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/components/package.json b/npm/ng-packs/packages/components/package.json index 8bb70bee32..e05ef33798 100644 --- a/npm/ng-packs/packages/components/package.json +++ b/npm/ng-packs/packages/components/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.components", - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "peerDependencies": { - "@abp/ng.core": ">=7.4.0-rc.4", - "@abp/ng.theme.shared": ">=7.4.0-rc.4" + "@abp/ng.core": ">=7.4.0-rc.5", + "@abp/ng.theme.shared": ">=7.4.0-rc.5" }, "dependencies": { "chart.js": "^3.5.1", diff --git a/npm/ng-packs/packages/components/page/src/page.component.ts b/npm/ng-packs/packages/components/page/src/page.component.ts index 754aa0d878..d0a48b145c 100644 --- a/npm/ng-packs/packages/components/page/src/page.component.ts +++ b/npm/ng-packs/packages/components/page/src/page.component.ts @@ -25,7 +25,7 @@ export class PageComponent { return this._toolbarData; } - @Input() breadcrumb = false; + @Input() breadcrumb = true; pageParts = { title: PageParts.title, diff --git a/npm/ng-packs/packages/core/package.json b/npm/ng-packs/packages/core/package.json index d3001c8ecb..286f2f2c36 100644 --- a/npm/ng-packs/packages/core/package.json +++ b/npm/ng-packs/packages/core/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.core", - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/utils": "~7.4.0-rc.4", + "@abp/utils": "~7.4.0-rc.5", "angular-oauth2-oidc": "^15.0.1", "just-clone": "^6.1.1", "just-compare": "^2.3.0", diff --git a/npm/ng-packs/packages/core/src/lib/tests/capsLock.directive.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/capsLock.directive.spec.ts index 3182dfa2dd..9ba6095206 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/capsLock.directive.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/capsLock.directive.spec.ts @@ -11,7 +11,7 @@ import { By } from '@angular/platform-browser'; imports:[TrackCapsLockDirective] }) class TestComponent { - capsLock:boolean = false + capsLock = false } describe('TrackCapsLockDirective',()=>{ diff --git a/npm/ng-packs/packages/core/src/lib/tests/content-projection.service.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/content-projection.service.spec.ts index 30f9f92e73..34f9451b0a 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/content-projection.service.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/content-projection.service.spec.ts @@ -10,7 +10,6 @@ describe('ContentProjectionService', () => { // createServiceFactory does not accept entryComponents directly @NgModule({ declarations: [TestComponent], - entryComponents: [TestComponent], }) class TestModule {} diff --git a/npm/ng-packs/packages/core/src/lib/tests/dynamic-layout.component.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/dynamic-layout.component.spec.ts index 2076be84b4..411a9e8041 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/dynamic-layout.component.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/dynamic-layout.component.spec.ts @@ -36,7 +36,6 @@ const LAYOUTS = [ @NgModule({ imports: [RouterModule], declarations: [...LAYOUTS], - entryComponents: [...LAYOUTS], }) class DummyLayoutModule {} diff --git a/npm/ng-packs/packages/core/src/lib/tests/object-utils.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/object-utils.spec.ts index 235d2e90ed..f2548bfc79 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/object-utils.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/object-utils.spec.ts @@ -43,11 +43,9 @@ describe('DeepMerge', () => { ); it('should correctly return when both inputs are objects with different fields', () => { - const target = { a: 1 }; - const source = { b: 2 }; const expected = { a: 1, b: 2 }; - expect(deepMerge(target, source)).toEqual(expected); - expect(deepMerge(source, target)).toEqual(expected); + expect(deepMerge({ a: 1 }, { b: 2 })).toEqual(expected); + expect(deepMerge({ b: 2 }, { a: 1 })).toEqual(expected); }); it('should correctly return when both inputs are object with same fields but different values', () => { diff --git a/npm/ng-packs/packages/core/src/lib/tests/routes.service.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/routes.service.spec.ts index ab9c6a76ae..b2ce154421 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/routes.service.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/routes.service.spec.ts @@ -3,14 +3,15 @@ import { take } from 'rxjs/operators'; import { RoutesService } from '../services/routes.service'; import { DummyInjector } from './utils/common.utils'; import { mockPermissionService } from './utils/permission-service.spec.utils'; +import { mockCompareFunction } from './utils/mock-compare-function'; const updateStream$ = new Subject(); - export const mockRoutesService = (injectorPayload = {} as { [key: string]: any }) => { const injector = new DummyInjector({ PermissionService: mockPermissionService(), ConfigStateService: { createOnUpdateStream: () => updateStream$ }, OTHERS_GROUP: 'OthersGroup', + SORT_COMPARE_FUNC: mockCompareFunction, ...injectorPayload, }); return new RoutesService(injector); @@ -50,7 +51,6 @@ describe('Routes Service', () => { const flat = await lastValueFrom(service.flat$.pipe(take(1))); const tree = await lastValueFrom(service.tree$.pipe(take(1))); const visible = await lastValueFrom(service.visible$.pipe(take(1))); - expect(flat.length).toBe(5); expect(flat[0].name).toBe('baz'); expect(flat[1].name).toBe('qux'); diff --git a/npm/ng-packs/packages/core/src/lib/tests/show-password-directive.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/show-password-directive.spec.ts index 8babb472c4..a1e766dc51 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/show-password-directive.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/show-password-directive.spec.ts @@ -13,7 +13,7 @@ import { By } from '@angular/platform-browser'; imports:[ShowPasswordDirective] }) class TestComponent { - showPassword:boolean = false + showPassword = false } describe('ShowPasswordDirective',()=>{ @@ -46,7 +46,7 @@ describe('ShowPasswordDirective',()=>{ }); it('should have three input has ShowPasswordDirective elements', () => { - let input = des[2].nativeElement + const input = des[2].nativeElement expect(input.type).toBe('password') fixture.componentInstance.showPassword = true fixture.detectChanges() diff --git a/npm/ng-packs/packages/core/src/lib/tests/utils/mock-compare-function.ts b/npm/ng-packs/packages/core/src/lib/tests/utils/mock-compare-function.ts new file mode 100644 index 0000000000..c563b0b877 --- /dev/null +++ b/npm/ng-packs/packages/core/src/lib/tests/utils/mock-compare-function.ts @@ -0,0 +1,20 @@ +import { ABP } from "../../models"; + + +export const mockCompareFunction = (a: ABP.Route, b: ABP.Route) => { + const aName = a.name; + const bName = b.name; + const aNumber = a.order; + const bNumber = b.order; + + if (!Number.isInteger(aNumber)) return 1; + if (!Number.isInteger(bNumber)) return -1; + + if (aNumber > bNumber) return 1 + if (aNumber < bNumber) return -1 + + if ( aName > bName ) return 1; + if ( aName < bName ) return -1; + + return 0 +} \ No newline at end of file diff --git a/npm/ng-packs/packages/core/src/lib/tokens/index.ts b/npm/ng-packs/packages/core/src/lib/tokens/index.ts index d01f652b98..12f4aae15a 100644 --- a/npm/ng-packs/packages/core/src/lib/tokens/index.ts +++ b/npm/ng-packs/packages/core/src/lib/tokens/index.ts @@ -12,4 +12,5 @@ export * from './pipe-to-login.token'; export * from './set-token-response-to-storage.token'; export * from './check-authentication-state'; export * from './http-context.token'; -export * from './others-group.token' \ No newline at end of file +export * from './others-group.token'; +export * from './tenant-not-found-by-name'; diff --git a/npm/ng-packs/packages/core/src/lib/tokens/tenant-not-found-by-name.ts b/npm/ng-packs/packages/core/src/lib/tokens/tenant-not-found-by-name.ts new file mode 100644 index 0000000000..639c1a3d1e --- /dev/null +++ b/npm/ng-packs/packages/core/src/lib/tokens/tenant-not-found-by-name.ts @@ -0,0 +1,6 @@ +import { InjectionToken } from '@angular/core'; +import { HttpErrorResponse } from '@angular/common/http'; + +export const TENANT_NOT_FOUND_BY_NAME = new InjectionToken< + (HttpErrorResponse: HttpErrorResponse) => void +>('TENANT_NOT_FOUND_BY_NAME'); diff --git a/npm/ng-packs/packages/core/src/lib/utils/multi-tenancy-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/multi-tenancy-utils.ts index a0b5aa89c6..cd1b9fe50e 100644 --- a/npm/ng-packs/packages/core/src/lib/utils/multi-tenancy-utils.ts +++ b/npm/ng-packs/packages/core/src/lib/utils/multi-tenancy-utils.ts @@ -1,13 +1,14 @@ import { Injector } from '@angular/core'; import clone from 'just-clone'; - -import { tap } from 'rxjs/operators'; import { Environment } from '../models/environment'; import { FindTenantResultDto } from '../proxy/volo/abp/asp-net-core/mvc/multi-tenancy/models'; import { EnvironmentService } from '../services/environment.service'; import { MultiTenancyService } from '../services/multi-tenancy.service'; import { createTokenParser } from './string-utils'; +import { firstValueFrom } from 'rxjs'; +import { TENANT_NOT_FOUND_BY_NAME } from '../tokens/tenant-not-found-by-name'; +import { HttpErrorResponse } from '@angular/common/http'; const tenancyPlaceholder = '{0}'; @@ -27,6 +28,7 @@ function getCurrentTenancyNameFromUrl(tenantKey: string) { export async function parseTenantFromUrl(injector: Injector) { const environmentService = injector.get(EnvironmentService); const multiTenancyService = injector.get(MultiTenancyService); + const tenantNotFoundHandler = injector.get(TENANT_NOT_FOUND_BY_NAME, null); const baseUrl = environmentService.getEnvironment()?.application?.baseUrl || ''; const tenancyName = getCurrentTenancyName(baseUrl); @@ -55,21 +57,33 @@ export async function parseTenantFromUrl(injector: Injector) { * Before this request takes place, we need to replace placeholders aka "{0}". */ replaceTenantNameWithinEnvironment(injector, tenancyName); - return multiTenancyService - .setTenantByName(tenancyName) - .pipe(tap(setEnvironmentWithDomainTenant)) - .toPromise(); - } else { - /** - * If there is no tenant, we still have to clean up {0}. from baseUrl to avoid incorrect http requests. - */ - replaceTenantNameWithinEnvironment(injector, '', tenancyPlaceholder + '.'); - const tenantIdFromQueryParams = getCurrentTenancyNameFromUrl(multiTenancyService.tenantKey); - if (tenantIdFromQueryParams) { - return multiTenancyService.setTenantById(tenantIdFromQueryParams).toPromise(); + const tenant$ = multiTenancyService.setTenantByName(tenancyName); + try { + const result = await firstValueFrom(tenant$); + setEnvironmentWithDomainTenant(result); + return Promise.resolve(result); + } catch (httpError: HttpErrorResponse | any) { + if ( + httpError instanceof HttpErrorResponse && + httpError.status === 404 && + tenantNotFoundHandler + ) { + tenantNotFoundHandler(httpError); + } + return Promise.reject(); } } + /** + * If there is no tenant, we still have to clean up {0}. from baseUrl to avoid incorrect http requests. + */ + replaceTenantNameWithinEnvironment(injector, '', tenancyPlaceholder + '.'); + + const tenantIdFromQueryParams = getCurrentTenancyNameFromUrl(multiTenancyService.tenantKey); + if (tenantIdFromQueryParams) { + const tenantById$ = multiTenancyService.setTenantById(tenantIdFromQueryParams); + return firstValueFrom(tenantById$); + } return Promise.resolve(); } @@ -97,14 +111,20 @@ function replaceTenantNameWithinEnvironment( ); } - if(!environment.oAuthConfig) { + if (!environment.oAuthConfig) { environment.oAuthConfig = {}; } - environment.oAuthConfig.issuer = (environment.oAuthConfig.issuer || '').replace(placeholder, tenancyName); + environment.oAuthConfig.issuer = (environment.oAuthConfig.issuer || '').replace( + placeholder, + tenancyName, + ); Object.keys(environment.apis).forEach(api => { Object.keys(environment.apis[api]).forEach(key => { - environment.apis[api][key] = (environment.apis[api][key] || '').replace(placeholder, tenancyName); + environment.apis[api][key] = (environment.apis[api][key] || '').replace( + placeholder, + tenancyName, + ); }); }); diff --git a/npm/ng-packs/packages/feature-management/package.json b/npm/ng-packs/packages/feature-management/package.json index b4b752287e..699f860c0c 100644 --- a/npm/ng-packs/packages/feature-management/package.json +++ b/npm/ng-packs/packages/feature-management/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.feature-management", - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~7.4.0-rc.4", + "@abp/ng.theme.shared": "~7.4.0-rc.5", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/generators/package.json b/npm/ng-packs/packages/generators/package.json index da0c28264c..3e3f0ddd47 100644 --- a/npm/ng-packs/packages/generators/package.json +++ b/npm/ng-packs/packages/generators/package.json @@ -1,6 +1,6 @@ { "name": "@abp/nx.generators", - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "homepage": "https://abp.io", "generators": "./generators.json", "type": "commonjs", diff --git a/npm/ng-packs/packages/identity/package.json b/npm/ng-packs/packages/identity/package.json index 1137db7800..3533bd489e 100644 --- a/npm/ng-packs/packages/identity/package.json +++ b/npm/ng-packs/packages/identity/package.json @@ -1,15 +1,15 @@ { "name": "@abp/ng.identity", - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.components": "~7.4.0-rc.4", - "@abp/ng.permission-management": "~7.4.0-rc.4", - "@abp/ng.theme.shared": "~7.4.0-rc.4", + "@abp/ng.components": "~7.4.0-rc.5", + "@abp/ng.permission-management": "~7.4.0-rc.5", + "@abp/ng.theme.shared": "~7.4.0-rc.5", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/oauth/package.json b/npm/ng-packs/packages/oauth/package.json index 58f66c4870..20bdd1de9d 100644 --- a/npm/ng-packs/packages/oauth/package.json +++ b/npm/ng-packs/packages/oauth/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.oauth", - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.core": "~7.4.0-rc.4", - "@abp/utils": "~7.4.0-rc.4", + "@abp/ng.core": "~7.4.0-rc.5", + "@abp/utils": "~7.4.0-rc.5", "angular-oauth2-oidc": "^15.0.1", "just-clone": "^6.1.1", "just-compare": "^2.3.0", diff --git a/npm/ng-packs/packages/oauth/src/lib/services/oauth.service.ts b/npm/ng-packs/packages/oauth/src/lib/services/oauth.service.ts index e929ab7c79..8b10d39bf2 100644 --- a/npm/ng-packs/packages/oauth/src/lib/services/oauth.service.ts +++ b/npm/ng-packs/packages/oauth/src/lib/services/oauth.service.ts @@ -1,6 +1,6 @@ import { Injectable, Injector } from '@angular/core'; import { Params } from '@angular/router'; -import { from, Observable, lastValueFrom } from 'rxjs'; +import { from, Observable, lastValueFrom, EMPTY } from 'rxjs'; import { filter, map, switchMap, take, tap } from 'rxjs/operators'; import { AbpAuthResponse, IAuthService, LoginParams } from '@abp/ng.core'; import { AuthFlowStrategy } from '../strategies'; @@ -44,6 +44,10 @@ export class AbpOAuthService implements IAuthService { } logout(queryParams?: Params): Observable { + + if(!this.strategy){ + return EMPTY + } return this.strategy.logout(queryParams); } diff --git a/npm/ng-packs/packages/oauth/src/lib/tests/api.interceptor.spec.ts b/npm/ng-packs/packages/oauth/src/lib/tests/api.interceptor.spec.ts index 1b102b8589..04a7652300 100644 --- a/npm/ng-packs/packages/oauth/src/lib/tests/api.interceptor.spec.ts +++ b/npm/ng-packs/packages/oauth/src/lib/tests/api.interceptor.spec.ts @@ -3,11 +3,12 @@ import { SpyObject } from '@ngneat/spectator'; import { createServiceFactory, SpectatorService } from '@ngneat/spectator/jest'; import { OAuthService } from 'angular-oauth2-oidc'; import { Subject, timer } from 'rxjs'; -import { ApiInterceptor, HttpWaitService, SessionStateService, TENANT_KEY } from '@abp/ng.core'; +import { HttpWaitService, SessionStateService, TENANT_KEY } from '@abp/ng.core'; +import { OAuthApiInterceptor } from '../interceptors'; describe('ApiInterceptor', () => { - let spectator: SpectatorService; - let interceptor: ApiInterceptor; + let spectator: SpectatorService; + let interceptor: OAuthApiInterceptor; let oauthService: SpyObject; let sessionState: SpyObject; let httpWaitService: SpyObject; @@ -15,7 +16,7 @@ describe('ApiInterceptor', () => { const testTenantKey = 'TEST_TENANT_KEY'; const createService = createServiceFactory({ - service: ApiInterceptor, + service: OAuthApiInterceptor, mocks: [OAuthService, SessionStateService], providers: [{ provide: TENANT_KEY, useValue: testTenantKey }], }); diff --git a/npm/ng-packs/packages/oauth/src/lib/tests/auth.guard.spec.ts b/npm/ng-packs/packages/oauth/src/lib/tests/auth.guard.spec.ts index 1440f9249a..feca76666e 100644 --- a/npm/ng-packs/packages/oauth/src/lib/tests/auth.guard.spec.ts +++ b/npm/ng-packs/packages/oauth/src/lib/tests/auth.guard.spec.ts @@ -1,11 +1,15 @@ -import { createServiceFactory, SpectatorService } from '@ngneat/spectator/jest'; +import { createServiceFactory, SpectatorService, createSpyObject } from '@ngneat/spectator/jest'; import { OAuthService } from 'angular-oauth2-oidc'; import { AbpOAuthGuard } from '../guards/oauth.guard'; import { AuthService } from '@abp/ng.core'; +import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router'; describe('AuthGuard', () => { let spectator: SpectatorService; - let guard: AbpOAuthGuard; + let guard : AbpOAuthGuard; + const route = createSpyObject(ActivatedRouteSnapshot) + const state = createSpyObject(RouterStateSnapshot) + const createService = createServiceFactory({ service: AbpOAuthGuard, mocks: [OAuthService, AuthService], @@ -18,7 +22,7 @@ describe('AuthGuard', () => { it('should return true when user logged in', () => { spectator.inject(OAuthService).hasValidAccessToken.andReturn(true); - expect(guard.canActivate()).toBe(true); + expect(guard.canActivate(route, state)).toBe(true); }); it('should execute the navigateToLogin method of the authService', () => { @@ -26,7 +30,7 @@ describe('AuthGuard', () => { spectator.inject(OAuthService).hasValidAccessToken.andReturn(false); const navigateToLoginSpy = jest.spyOn(authService, 'navigateToLogin'); - expect(guard.canActivate()).toBe(false); + expect(guard.canActivate(route, state)).toBe(false); expect(navigateToLoginSpy).toHaveBeenCalled(); }); }); diff --git a/npm/ng-packs/packages/permission-management/package.json b/npm/ng-packs/packages/permission-management/package.json index daa320eb5a..ee30f9dcfd 100644 --- a/npm/ng-packs/packages/permission-management/package.json +++ b/npm/ng-packs/packages/permission-management/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.permission-management", - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~7.4.0-rc.4", + "@abp/ng.theme.shared": "~7.4.0-rc.5", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/schematics/package.json b/npm/ng-packs/packages/schematics/package.json index 15b95b639b..8d9f5fc121 100644 --- a/npm/ng-packs/packages/schematics/package.json +++ b/npm/ng-packs/packages/schematics/package.json @@ -1,6 +1,6 @@ { "name": "@abp/ng.schematics", - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "author": "", "schematics": "./collection.json", "dependencies": { diff --git a/npm/ng-packs/packages/setting-management/package.json b/npm/ng-packs/packages/setting-management/package.json index e0832d0836..4edf3109c6 100644 --- a/npm/ng-packs/packages/setting-management/package.json +++ b/npm/ng-packs/packages/setting-management/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.setting-management", - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.components": "~7.4.0-rc.4", - "@abp/ng.theme.shared": "~7.4.0-rc.4", + "@abp/ng.components": "~7.4.0-rc.5", + "@abp/ng.theme.shared": "~7.4.0-rc.5", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/tenant-management/package.json b/npm/ng-packs/packages/tenant-management/package.json index 5eac1080cf..a4ea337108 100644 --- a/npm/ng-packs/packages/tenant-management/package.json +++ b/npm/ng-packs/packages/tenant-management/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.tenant-management", - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.feature-management": "~7.4.0-rc.4", - "@abp/ng.theme.shared": "~7.4.0-rc.4", + "@abp/ng.feature-management": "~7.4.0-rc.5", + "@abp/ng.theme.shared": "~7.4.0-rc.5", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/theme-basic/package.json b/npm/ng-packs/packages/theme-basic/package.json index 375994c24c..922256bec5 100644 --- a/npm/ng-packs/packages/theme-basic/package.json +++ b/npm/ng-packs/packages/theme-basic/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.theme.basic", - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.account.core": "~7.4.0-rc.4", - "@abp/ng.theme.shared": "~7.4.0-rc.4", + "@abp/ng.account.core": "~7.4.0-rc.5", + "@abp/ng.theme.shared": "~7.4.0-rc.5", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/tests/entity-actions.spec.ts b/npm/ng-packs/packages/theme-shared/extensions/src/tests/entity-actions.spec.ts index 35833a1950..5ee3889c0c 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/tests/entity-actions.spec.ts +++ b/npm/ng-packs/packages/theme-shared/extensions/src/tests/entity-actions.spec.ts @@ -107,7 +107,7 @@ describe('EntityAction', () => { expect(action.text).toBe(options.text); expect(action.action).toBe(options.action); - expect(action.permission).toBeUndefined(); + expect(action.permission).toBe(''); expect(action.visible(null)).toBe(true); expect(action.icon).toBe(''); }); diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/tests/entity-props.spec.ts b/npm/ng-packs/packages/theme-shared/extensions/src/tests/entity-props.spec.ts index 8de503c5f0..bb1c2c7cc4 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/tests/entity-props.spec.ts +++ b/npm/ng-packs/packages/theme-shared/extensions/src/tests/entity-props.spec.ts @@ -111,13 +111,11 @@ describe('EntityProp', () => { type: ePropType.String, name: 'NAME', }; - const prop = new EntityProp(options); - expect(prop.type).toBe(options.type); expect(prop.name).toBe(options.name); expect(prop.displayName).toBe(options.name); - expect(prop.permission).toBeUndefined(); + expect(prop.permission).toBe(''); expect(prop.visible()).toBe(true); expect(prop.sortable).toBe(false); expect(prop.columnWidth).toBeUndefined(); diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/tests/enum.util.spec.ts b/npm/ng-packs/packages/theme-shared/extensions/src/tests/enum.util.spec.ts index d0fbdde765..56c61e1fc8 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/tests/enum.util.spec.ts +++ b/npm/ng-packs/packages/theme-shared/extensions/src/tests/enum.util.spec.ts @@ -1,4 +1,4 @@ -import { ConfigStateService, LocalizationService } from '@abp/ng.core'; +import { ConfigStateService, ExtensionEnumFieldDto, LocalizationService } from '@abp/ng.core'; import { BehaviorSubject, of } from 'rxjs'; import { take } from 'rxjs/operators'; import { PropData } from '../lib/models/props'; @@ -11,10 +11,10 @@ const mockSessionState = { onLanguageChange$: () => new BehaviorSubject('tr'), } as any; -const fields = [ - { name: 'foo', value: 1 }, - { name: 'bar', value: 2 }, - { name: 'baz', value: 3 }, +const fields: ExtensionEnumFieldDto[] = [ + { name: 'foo', value: {number: 1} }, + { name: 'bar', value: {number: 2} }, + { name: 'baz', value: {number: 3} }, ]; class MockPropData extends PropData { @@ -42,17 +42,13 @@ describe('Enum Utils', () => { describe('#createEnum', () => { const enumFromFields = createEnum(fields); - test.each` - key | expected - ${'foo'} | ${1} - ${'bar'} | ${2} - ${'baz'} | ${3} - ${1} | ${'foo'} - ${2} | ${'bar'} - ${3} | ${'baz'} - `('should create an enum that returns $expected when $key is accessed', ({ key, expected }) => { - expect(enumFromFields[key]).toBe(expected); - }); + test.each([ + {name:'foo', value: 'number', expected: 1}, + {name:'bar', value: 'number', expected: 2}, + {name:'baz', value: 'number', expected: 3} + ])('should create an enum that returns $expected when $name $value is accessed',({name, value, expected})=>{ + expect(enumFromFields[name][value]).toBe(expected); + }) }); describe('#createEnumValueResolver', () => { @@ -75,7 +71,7 @@ describe('Enum Utils', () => { 'EnumProp', ); const propData = new MockPropData({ - extraProperties: { EnumProp: value }, + extraProperties: { EnumProp: value }, }); propData.getInjected = () => service as any; @@ -111,8 +107,9 @@ describe('Enum Utils', () => { function createMockLocalizationService() { const fakeAppConfigService = { get: () => of({ localization: mockL10n }) } as any; - const configState = new ConfigStateService(fakeAppConfigService); + const fakeLocalizationService = { get: () => of({ localization: mockL10n }) } as any; + const configState = new ConfigStateService(fakeAppConfigService, fakeLocalizationService, false); configState.refreshAppState(); return new LocalizationService(mockSessionState, null, null, configState); -} +} \ No newline at end of file diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/tests/form-props.spec.ts b/npm/ng-packs/packages/theme-shared/extensions/src/tests/form-props.spec.ts index bd933741a5..3b3298babc 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/tests/form-props.spec.ts +++ b/npm/ng-packs/packages/theme-shared/extensions/src/tests/form-props.spec.ts @@ -127,14 +127,14 @@ describe('FormProp', () => { expect(prop.type).toBe(options.type); expect(prop.name).toBe(options.name); expect(prop.displayName).toBe(options.name); - expect(prop.permission).toBeUndefined(); + expect(prop.permission).toBe(''); expect(prop.visible()).toBe(true); expect(prop.asyncValidators(null)).toEqual([]); expect(prop.validators(null)).toEqual([]); expect(prop.disabled()).toBe(false); expect(prop.readonly()).toBe(false); expect(prop.autocomplete).toBe('off'); - expect(prop.defaultValue).toBeNull(); + expect(prop.defaultValue).toBe(''); expect(prop.options).toBeUndefined(); expect(prop.id).toBe(options.name); }); @@ -144,7 +144,7 @@ describe('FormProp', () => { ${0} | ${0} ${''} | ${''} ${false} | ${false} - ${undefined} | ${null} + ${undefined} | ${''} `( 'should set defaultValue as $expected when $defaultValue is given', ({ defaultValue, expected }) => { diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/tests/localization.util.spec.ts b/npm/ng-packs/packages/theme-shared/extensions/src/tests/localization.util.spec.ts index 007b304b42..da41ea913b 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/tests/localization.util.spec.ts +++ b/npm/ng-packs/packages/theme-shared/extensions/src/tests/localization.util.spec.ts @@ -3,17 +3,20 @@ import { createDisplayNameLocalizationPipeKeyGenerator } from '../lib/utils/loca describe('Localization Utils', () => { describe('#createDisplayNameLocalizationPipeKeyGenerator', () => { - const generateDisplayName = createDisplayNameLocalizationPipeKeyGenerator({ - values: { + const localization: ApplicationLocalizationConfigurationDto = { + values:{ Foo: { Bar: 'Bar', 'DisplayName:Bar': 'Bar' }, Default: { Bar: 'Bar', 'DisplayName:Bar': 'Bar' }, }, defaultResourceName: 'Default', - currentCulture: null, + resources: {}, languages: [], languageFilesMap: null, languagesMap: null, - } as ApplicationLocalizationConfigurationDto); + currentCulture: null + } + + const generateDisplayName = createDisplayNameLocalizationPipeKeyGenerator(localization); test.each` displayName | fallback | expected diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/tests/state.util.spec.ts b/npm/ng-packs/packages/theme-shared/extensions/src/tests/state.util.spec.ts index cedd632165..c9efdce913 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/tests/state.util.spec.ts +++ b/npm/ng-packs/packages/theme-shared/extensions/src/tests/state.util.spec.ts @@ -11,7 +11,8 @@ import { } from '../lib/utils/state.util'; const fakeAppConfigService = { get: () => of(createMockState()) } as any; -const configState = new ConfigStateService(fakeAppConfigService); +const fakeLocalizationService = { get: () => of(createMockState()) } as any; +const configState = new ConfigStateService(fakeAppConfigService,fakeLocalizationService,false); configState.refreshAppState(); describe('State Utils', () => { @@ -30,7 +31,7 @@ describe('State Utils', () => { }); it('should not emit when object extensions do not exist', done => { - const emptyConfigState = new ConfigStateService(null); + const emptyConfigState = new ConfigStateService(null,null,false); const emit = jest.fn(); getObjectExtensionEntitiesFromStore(emptyConfigState, 'Identity').subscribe(emit); diff --git a/npm/ng-packs/packages/theme-shared/package.json b/npm/ng-packs/packages/theme-shared/package.json index 798bce2ae4..822b0ba3ae 100644 --- a/npm/ng-packs/packages/theme-shared/package.json +++ b/npm/ng-packs/packages/theme-shared/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.theme.shared", - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.core": "~7.4.0-rc.4", + "@abp/ng.core": "~7.4.0-rc.5", "@fortawesome/fontawesome-free": "^5.15.4", "@ng-bootstrap/ng-bootstrap": "^15.0.0", "@ngx-validate/core": "^0.2.0", diff --git a/npm/ng-packs/packages/theme-shared/src/lib/providers/index.ts b/npm/ng-packs/packages/theme-shared/src/lib/providers/index.ts index cac8aa5d94..b6b1f9b60f 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/providers/index.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/providers/index.ts @@ -1,3 +1,4 @@ export * from './ng-bootstrap-config.provider'; export * from './route.provider'; +export * from './tenant-not-found.provider'; export * from './error-handlers.provider'; diff --git a/npm/ng-packs/packages/theme-shared/src/lib/providers/tenant-not-found.provider.ts b/npm/ng-packs/packages/theme-shared/src/lib/providers/tenant-not-found.provider.ts new file mode 100644 index 0000000000..ac98f613b4 --- /dev/null +++ b/npm/ng-packs/packages/theme-shared/src/lib/providers/tenant-not-found.provider.ts @@ -0,0 +1,20 @@ +import { TENANT_NOT_FOUND_BY_NAME } from '@abp/ng.core'; +import { inject, Provider } from '@angular/core'; +import { ConfirmationService } from '../services'; +import { HttpErrorResponse } from '@angular/common/http'; + +export const tenantNotFoundProvider: Provider = { + provide: TENANT_NOT_FOUND_BY_NAME, + useFactory: function () { + const confirm = inject(ConfirmationService); + return (response: HttpErrorResponse) => { + const { error } = response.error; + // hide loading donut + const appRoot = document.querySelector('app-root div.donut'); + if (appRoot) { + appRoot.remove(); + } + confirm.error(error.details, error.message, { hideCancelBtn: true, hideYesBtn: true }); + }; + }, +}; diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/breadcrumb.component.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/breadcrumb.component.spec.ts index 75f0c8ab55..40a1109de0 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/tests/breadcrumb.component.spec.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/breadcrumb.component.spec.ts @@ -5,7 +5,7 @@ import { RouterOutletComponent, RoutesService, } from '@abp/ng.core'; -import { HttpClient } from '@angular/common/http'; +import { HttpClient, HttpClientModule } from '@angular/common/http'; import { RouterModule } from '@angular/router'; import { createRoutingFactory, SpectatorRouting } from '@ngneat/spectator/jest'; // eslint-disable-next-line @nx/enforce-module-boundaries @@ -34,7 +34,7 @@ describe('BreadcrumbComponent', () => { }, ], declarations: [LocalizationPipe, BreadcrumbComponent, BreadcrumbItemsComponent], - imports: [RouterModule], + imports: [RouterModule,HttpClientModule], routes: [ { path: '', @@ -62,7 +62,6 @@ describe('BreadcrumbComponent', () => { routes.add(mockRoutes); await spectator.router.navigateByUrl('/identity/users'); spectator.detectChanges(); - const elements = spectator.queryAll('li'); expect(elements).toHaveLength(3); expect(elements[1]).toHaveText('Identity'); diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/confirmation.service.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/confirmation.service.spec.ts index 5674a501de..587365e3f6 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/tests/confirmation.service.spec.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/confirmation.service.spec.ts @@ -10,7 +10,6 @@ import { CONFIRMATION_ICONS, DEFAULT_CONFIRMATION_ICONS } from '../tokens/confir @NgModule({ exports: [ConfirmationComponent], - entryComponents: [ConfirmationComponent], declarations: [ConfirmationComponent], imports: [CoreTestingModule.withConfig()], providers: [{ provide: CONFIRMATION_ICONS, useValue: DEFAULT_CONFIRMATION_ICONS }], diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/error.component.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/error.component.spec.ts index 510ef4104d..5bde4d2a54 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/tests/error.component.spec.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/error.component.spec.ts @@ -1,5 +1,5 @@ import { CORE_OPTIONS, LocalizationPipe } from '@abp/ng.core'; -import { HttpClient } from '@angular/common/http'; +import { HttpClient, HttpClientModule } from '@angular/common/http'; import { ElementRef, Renderer2 } from '@angular/core'; import { createHostFactory, SpectatorHost } from '@ngneat/spectator/jest'; import { Subject } from 'rxjs'; @@ -19,6 +19,7 @@ describe('ErrorComponent', () => { useValue: { nativeElement: document.createElement('div') }, }, ], + imports:[HttpClientModule] }); beforeEach(() => { diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/toaster.service.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/toaster.service.spec.ts index d0d41edf22..4e1b2830c7 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/tests/toaster.service.spec.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/toaster.service.spec.ts @@ -8,7 +8,6 @@ import { ToasterService } from '../services/toaster.service'; @NgModule({ exports: [ToastContainerComponent], - entryComponents: [ToastContainerComponent], declarations: [ToastContainerComponent, ToastComponent], imports: [CoreTestingModule.withConfig()], }) diff --git a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts index 1009d9dd60..ce1d5b40fe 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts @@ -40,6 +40,7 @@ import { CardModule } from './components/card/card.module'; import { AbpVisibleDirective } from './directives'; import { FormInputComponent } from './components/form-input/form-input.component'; import { FormCheckboxComponent } from './components/checkbox/checkbox.component'; +import { tenantNotFoundProvider } from './providers/tenant-not-found.provider'; const declarationsWithExports = [ BreadcrumbComponent, @@ -143,6 +144,7 @@ export class ThemeSharedModule { ...(confirmationIcons || {}), }, }, + tenantNotFoundProvider, ERROR_HANDLERS_PROVIDERS, ], }; diff --git a/npm/packs/anchor-js/package.json b/npm/packs/anchor-js/package.json index 216b7f4c25..a37707bb8d 100644 --- a/npm/packs/anchor-js/package.json +++ b/npm/packs/anchor-js/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/anchor-js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.4", + "@abp/core": "~7.4.0-rc.5", "anchor-js": "^4.3.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/aspnetcore.components.server.basictheme/package.json b/npm/packs/aspnetcore.components.server.basictheme/package.json index 17f5bde782..86db45ebff 100644 --- a/npm/packs/aspnetcore.components.server.basictheme/package.json +++ b/npm/packs/aspnetcore.components.server.basictheme/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/aspnetcore.components.server.basictheme", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/aspnetcore.components.server.theming": "~7.4.0-rc.4" + "@abp/aspnetcore.components.server.theming": "~7.4.0-rc.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/aspnetcore.components.server.theming/package.json b/npm/packs/aspnetcore.components.server.theming/package.json index 49fa44a88d..19a1ad6703 100644 --- a/npm/packs/aspnetcore.components.server.theming/package.json +++ b/npm/packs/aspnetcore.components.server.theming/package.json @@ -1,12 +1,12 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/aspnetcore.components.server.theming", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/bootstrap": "~7.4.0-rc.4", - "@abp/font-awesome": "~7.4.0-rc.4" + "@abp/bootstrap": "~7.4.0-rc.5", + "@abp/font-awesome": "~7.4.0-rc.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json index 68d150d601..5bdbc05be6 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/aspnetcore.mvc.ui.theme.basic", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~7.4.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.shared": "~7.4.0-rc.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json index 2c5fba53f9..1080911ec3 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/aspnetcore.mvc.ui.theme.shared", "repository": { "type": "git", @@ -10,22 +10,22 @@ "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui": "~7.4.0-rc.4", - "@abp/bootstrap": "~7.4.0-rc.4", - "@abp/bootstrap-datepicker": "~7.4.0-rc.4", - "@abp/bootstrap-daterangepicker": "~7.4.0-rc.4", - "@abp/datatables.net-bs5": "~7.4.0-rc.4", - "@abp/font-awesome": "~7.4.0-rc.4", - "@abp/jquery-form": "~7.4.0-rc.4", - "@abp/jquery-validation-unobtrusive": "~7.4.0-rc.4", - "@abp/lodash": "~7.4.0-rc.4", - "@abp/luxon": "~7.4.0-rc.4", - "@abp/malihu-custom-scrollbar-plugin": "~7.4.0-rc.4", - "@abp/moment": "~7.4.0-rc.4", - "@abp/select2": "~7.4.0-rc.4", - "@abp/sweetalert2": "~7.4.0-rc.4", - "@abp/timeago": "~7.4.0-rc.4", - "@abp/toastr": "~7.4.0-rc.4" + "@abp/aspnetcore.mvc.ui": "~7.4.0-rc.5", + "@abp/bootstrap": "~7.4.0-rc.5", + "@abp/bootstrap-datepicker": "~7.4.0-rc.5", + "@abp/bootstrap-daterangepicker": "~7.4.0-rc.5", + "@abp/datatables.net-bs5": "~7.4.0-rc.5", + "@abp/font-awesome": "~7.4.0-rc.5", + "@abp/jquery-form": "~7.4.0-rc.5", + "@abp/jquery-validation-unobtrusive": "~7.4.0-rc.5", + "@abp/lodash": "~7.4.0-rc.5", + "@abp/luxon": "~7.4.0-rc.5", + "@abp/malihu-custom-scrollbar-plugin": "~7.4.0-rc.5", + "@abp/moment": "~7.4.0-rc.5", + "@abp/select2": "~7.4.0-rc.5", + "@abp/sweetalert2": "~7.4.0-rc.5", + "@abp/timeago": "~7.4.0-rc.5", + "@abp/toastr": "~7.4.0-rc.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/aspnetcore.mvc.ui/package-lock.json b/npm/packs/aspnetcore.mvc.ui/package-lock.json index 5c1d285ff9..f524d2f1df 100644 --- a/npm/packs/aspnetcore.mvc.ui/package-lock.json +++ b/npm/packs/aspnetcore.mvc.ui/package-lock.json @@ -1,6 +1,6 @@ { "name": "@abp/aspnetcore.mvc.ui", - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/npm/packs/aspnetcore.mvc.ui/package.json b/npm/packs/aspnetcore.mvc.ui/package.json index 12f963b7ad..8fac47ff20 100644 --- a/npm/packs/aspnetcore.mvc.ui/package.json +++ b/npm/packs/aspnetcore.mvc.ui/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/aspnetcore.mvc.ui", "repository": { "type": "git", diff --git a/npm/packs/blogging/package.json b/npm/packs/blogging/package.json index 649df2a435..555e31df83 100644 --- a/npm/packs/blogging/package.json +++ b/npm/packs/blogging/package.json @@ -1,14 +1,14 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/blogging", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~7.4.0-rc.4", - "@abp/owl.carousel": "~7.4.0-rc.4", - "@abp/prismjs": "~7.4.0-rc.4", - "@abp/tui-editor": "~7.4.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.shared": "~7.4.0-rc.5", + "@abp/owl.carousel": "~7.4.0-rc.5", + "@abp/prismjs": "~7.4.0-rc.5", + "@abp/tui-editor": "~7.4.0-rc.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/bootstrap-datepicker/package.json b/npm/packs/bootstrap-datepicker/package.json index a903c31137..67d1a3a3e3 100644 --- a/npm/packs/bootstrap-datepicker/package.json +++ b/npm/packs/bootstrap-datepicker/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/bootstrap-datepicker", "repository": { "type": "git", diff --git a/npm/packs/bootstrap-daterangepicker/package.json b/npm/packs/bootstrap-daterangepicker/package.json index 6e615111eb..e3252e615b 100644 --- a/npm/packs/bootstrap-daterangepicker/package.json +++ b/npm/packs/bootstrap-daterangepicker/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/bootstrap-daterangepicker", "repository": { "type": "git", diff --git a/npm/packs/bootstrap/package.json b/npm/packs/bootstrap/package.json index 1dcd78fc5a..7cb49b31cf 100644 --- a/npm/packs/bootstrap/package.json +++ b/npm/packs/bootstrap/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/bootstrap", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.4", + "@abp/core": "~7.4.0-rc.5", "bootstrap": "^5.1.3" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/chart.js/package.json b/npm/packs/chart.js/package.json index e743325176..c671ddc9dc 100644 --- a/npm/packs/chart.js/package.json +++ b/npm/packs/chart.js/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/chart.js", "publishConfig": { "access": "public" diff --git a/npm/packs/clipboard/package.json b/npm/packs/clipboard/package.json index 479f4a8c4c..52998ba5d7 100644 --- a/npm/packs/clipboard/package.json +++ b/npm/packs/clipboard/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/clipboard", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.4", + "@abp/core": "~7.4.0-rc.5", "clipboard": "^2.0.8" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/cms-kit.admin/package.json b/npm/packs/cms-kit.admin/package.json index 6508676f7a..7545eff910 100644 --- a/npm/packs/cms-kit.admin/package.json +++ b/npm/packs/cms-kit.admin/package.json @@ -1,15 +1,15 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/cms-kit.admin", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/codemirror": "~7.4.0-rc.4", - "@abp/jstree": "~7.4.0-rc.4", - "@abp/slugify": "~7.4.0-rc.4", - "@abp/tui-editor": "~7.4.0-rc.4", - "@abp/uppy": "~7.4.0-rc.4" + "@abp/codemirror": "~7.4.0-rc.5", + "@abp/jstree": "~7.4.0-rc.5", + "@abp/slugify": "~7.4.0-rc.5", + "@abp/tui-editor": "~7.4.0-rc.5", + "@abp/uppy": "~7.4.0-rc.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/cms-kit.public/package.json b/npm/packs/cms-kit.public/package.json index ab5aebc85b..79c8a40a83 100644 --- a/npm/packs/cms-kit.public/package.json +++ b/npm/packs/cms-kit.public/package.json @@ -1,12 +1,12 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/cms-kit.public", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/highlight.js": "~7.4.0-rc.4", - "@abp/star-rating-svg": "~7.4.0-rc.4" + "@abp/highlight.js": "~7.4.0-rc.5", + "@abp/star-rating-svg": "~7.4.0-rc.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/cms-kit/package.json b/npm/packs/cms-kit/package.json index 3e51781930..12b72474e7 100644 --- a/npm/packs/cms-kit/package.json +++ b/npm/packs/cms-kit/package.json @@ -1,12 +1,12 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/cms-kit", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/cms-kit.admin": "~7.4.0-rc.4", - "@abp/cms-kit.public": "~7.4.0-rc.4" + "@abp/cms-kit.admin": "~7.4.0-rc.5", + "@abp/cms-kit.public": "~7.4.0-rc.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/codemirror/package.json b/npm/packs/codemirror/package.json index 0ba35eaf43..29887632f2 100644 --- a/npm/packs/codemirror/package.json +++ b/npm/packs/codemirror/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/codemirror", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.4", + "@abp/core": "~7.4.0-rc.5", "codemirror": "^5.65.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/core/package.json b/npm/packs/core/package.json index 19308b19c0..def39cf8c7 100644 --- a/npm/packs/core/package.json +++ b/npm/packs/core/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/core", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/utils": "~7.4.0-rc.4" + "@abp/utils": "~7.4.0-rc.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/cropperjs/package.json b/npm/packs/cropperjs/package.json index 3506f7d902..89f9f20c6d 100644 --- a/npm/packs/cropperjs/package.json +++ b/npm/packs/cropperjs/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/cropperjs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.4", + "@abp/core": "~7.4.0-rc.5", "cropperjs": "^1.5.12" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/datatables.net-bs4/package.json b/npm/packs/datatables.net-bs4/package.json index f3219c18b5..cd99648420 100644 --- a/npm/packs/datatables.net-bs4/package.json +++ b/npm/packs/datatables.net-bs4/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/datatables.net-bs4", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/datatables.net": "~7.4.0-rc.4", + "@abp/datatables.net": "~7.4.0-rc.5", "datatables.net-bs4": "^1.11.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/datatables.net-bs5/package.json b/npm/packs/datatables.net-bs5/package.json index 741a9d6dcf..1ababf89fa 100644 --- a/npm/packs/datatables.net-bs5/package.json +++ b/npm/packs/datatables.net-bs5/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/datatables.net-bs5", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/datatables.net": "~7.4.0-rc.4", + "@abp/datatables.net": "~7.4.0-rc.5", "datatables.net-bs5": "^1.11.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/datatables.net/package.json b/npm/packs/datatables.net/package.json index 33e467d209..39b0a0e0c9 100644 --- a/npm/packs/datatables.net/package.json +++ b/npm/packs/datatables.net/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/datatables.net", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~7.4.0-rc.4", + "@abp/jquery": "~7.4.0-rc.5", "datatables.net": "^1.11.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/docs/package.json b/npm/packs/docs/package.json index b3ac82d941..dc9170bc9e 100644 --- a/npm/packs/docs/package.json +++ b/npm/packs/docs/package.json @@ -1,15 +1,15 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/docs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/anchor-js": "~7.4.0-rc.4", - "@abp/clipboard": "~7.4.0-rc.4", - "@abp/malihu-custom-scrollbar-plugin": "~7.4.0-rc.4", - "@abp/popper.js": "~7.4.0-rc.4", - "@abp/prismjs": "~7.4.0-rc.4" + "@abp/anchor-js": "~7.4.0-rc.5", + "@abp/clipboard": "~7.4.0-rc.5", + "@abp/malihu-custom-scrollbar-plugin": "~7.4.0-rc.5", + "@abp/popper.js": "~7.4.0-rc.5", + "@abp/prismjs": "~7.4.0-rc.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/flag-icon-css/package.json b/npm/packs/flag-icon-css/package.json index d45a7b2701..059679e496 100644 --- a/npm/packs/flag-icon-css/package.json +++ b/npm/packs/flag-icon-css/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/flag-icon-css", "publishConfig": { "access": "public" diff --git a/npm/packs/flag-icons/package.json b/npm/packs/flag-icons/package.json index 9d4dae4972..a7a0e070a4 100644 --- a/npm/packs/flag-icons/package.json +++ b/npm/packs/flag-icons/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/flag-icons", "publishConfig": { "access": "public" diff --git a/npm/packs/font-awesome/package.json b/npm/packs/font-awesome/package.json index d88436576e..6fec8caf89 100644 --- a/npm/packs/font-awesome/package.json +++ b/npm/packs/font-awesome/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/font-awesome", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.4", + "@abp/core": "~7.4.0-rc.5", "@fortawesome/fontawesome-free": "^5.15.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/highlight.js/package.json b/npm/packs/highlight.js/package.json index 226eeda6a4..db69b9b12c 100644 --- a/npm/packs/highlight.js/package.json +++ b/npm/packs/highlight.js/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/highlight.js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.4", + "@abp/core": "~7.4.0-rc.5", "@highlightjs/cdn-assets": "~11.4.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/jquery-form/package.json b/npm/packs/jquery-form/package.json index 931bb87622..8f2f309bff 100644 --- a/npm/packs/jquery-form/package.json +++ b/npm/packs/jquery-form/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/jquery-form", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~7.4.0-rc.4", + "@abp/jquery": "~7.4.0-rc.5", "jquery-form": "^4.3.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/jquery-validation-unobtrusive/package.json b/npm/packs/jquery-validation-unobtrusive/package.json index d2e9c59440..d3dde7c059 100644 --- a/npm/packs/jquery-validation-unobtrusive/package.json +++ b/npm/packs/jquery-validation-unobtrusive/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/jquery-validation-unobtrusive", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery-validation": "~7.4.0-rc.4", + "@abp/jquery-validation": "~7.4.0-rc.5", "jquery-validation-unobtrusive": "^3.2.12" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/jquery-validation/package.json b/npm/packs/jquery-validation/package.json index b3dc4e10f8..7aa4fb51fa 100644 --- a/npm/packs/jquery-validation/package.json +++ b/npm/packs/jquery-validation/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/jquery-validation", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~7.4.0-rc.4", + "@abp/jquery": "~7.4.0-rc.5", "jquery-validation": "^1.19.3" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/jquery/package.json b/npm/packs/jquery/package.json index 0ba6e8aea4..91f4aa58ef 100644 --- a/npm/packs/jquery/package.json +++ b/npm/packs/jquery/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/jquery", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.4", + "@abp/core": "~7.4.0-rc.5", "jquery": "~3.6.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/jstree/package.json b/npm/packs/jstree/package.json index 517359e606..de0a341f92 100644 --- a/npm/packs/jstree/package.json +++ b/npm/packs/jstree/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/jstree", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~7.4.0-rc.4", + "@abp/jquery": "~7.4.0-rc.5", "jstree": "^3.3.12" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/lodash/package.json b/npm/packs/lodash/package.json index a72ebfe997..5bd7a93752 100644 --- a/npm/packs/lodash/package.json +++ b/npm/packs/lodash/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/lodash", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.4", + "@abp/core": "~7.4.0-rc.5", "lodash": "^4.17.21" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/luxon/package.json b/npm/packs/luxon/package.json index a0926beee6..343cb89a14 100644 --- a/npm/packs/luxon/package.json +++ b/npm/packs/luxon/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/luxon", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.4", + "@abp/core": "~7.4.0-rc.5", "luxon": "^2.3.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/malihu-custom-scrollbar-plugin/package.json b/npm/packs/malihu-custom-scrollbar-plugin/package.json index ad84ba86a2..7757b5cf73 100644 --- a/npm/packs/malihu-custom-scrollbar-plugin/package.json +++ b/npm/packs/malihu-custom-scrollbar-plugin/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/malihu-custom-scrollbar-plugin", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.4", + "@abp/core": "~7.4.0-rc.5", "malihu-custom-scrollbar-plugin": "^3.1.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/markdown-it/package.json b/npm/packs/markdown-it/package.json index b129510e35..9065557a2a 100644 --- a/npm/packs/markdown-it/package.json +++ b/npm/packs/markdown-it/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/markdown-it", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.4", + "@abp/core": "~7.4.0-rc.5", "markdown-it": "^12.3.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/moment/package.json b/npm/packs/moment/package.json index bf4108bf07..0d9d129cd8 100644 --- a/npm/packs/moment/package.json +++ b/npm/packs/moment/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/moment", "repository": { "type": "git", diff --git a/npm/packs/owl.carousel/package.json b/npm/packs/owl.carousel/package.json index 4d059ee17b..30ec24105e 100644 --- a/npm/packs/owl.carousel/package.json +++ b/npm/packs/owl.carousel/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/owl.carousel", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.4", + "@abp/core": "~7.4.0-rc.5", "owl.carousel": "^2.3.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/popper.js/package.json b/npm/packs/popper.js/package.json index da1c17f9a1..4f3326b691 100644 --- a/npm/packs/popper.js/package.json +++ b/npm/packs/popper.js/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/popper.js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.4", + "@abp/core": "~7.4.0-rc.5", "@popperjs/core": "^2.11.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/prismjs/package.json b/npm/packs/prismjs/package.json index b21716b619..a0e5674f53 100644 --- a/npm/packs/prismjs/package.json +++ b/npm/packs/prismjs/package.json @@ -1,12 +1,12 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/prismjs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/clipboard": "~7.4.0-rc.4", - "@abp/core": "~7.4.0-rc.4", + "@abp/clipboard": "~7.4.0-rc.5", + "@abp/core": "~7.4.0-rc.5", "prismjs": "^1.26.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/qrcode/package.json b/npm/packs/qrcode/package.json index b6ae5110c4..ef8fc6cace 100644 --- a/npm/packs/qrcode/package.json +++ b/npm/packs/qrcode/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/qrcode", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.4" + "@abp/core": "~7.4.0-rc.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/select2/package.json b/npm/packs/select2/package.json index ec8768cc46..1263af63c0 100644 --- a/npm/packs/select2/package.json +++ b/npm/packs/select2/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/select2", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.4", + "@abp/core": "~7.4.0-rc.5", "select2": "^4.0.13" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/signalr/package.json b/npm/packs/signalr/package.json index 633449c1a3..a07b3f3b5a 100644 --- a/npm/packs/signalr/package.json +++ b/npm/packs/signalr/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/signalr", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.4", + "@abp/core": "~7.4.0-rc.5", "@microsoft/signalr": "~6.0.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/slugify/package.json b/npm/packs/slugify/package.json index 4662c21a6b..e4b1751898 100644 --- a/npm/packs/slugify/package.json +++ b/npm/packs/slugify/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/slugify", "publishConfig": { "access": "public" diff --git a/npm/packs/star-rating-svg/package.json b/npm/packs/star-rating-svg/package.json index 5bde9c74c8..ea72cdd461 100644 --- a/npm/packs/star-rating-svg/package.json +++ b/npm/packs/star-rating-svg/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/star-rating-svg", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~7.4.0-rc.4", + "@abp/jquery": "~7.4.0-rc.5", "star-rating-svg": "^3.5.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/sweetalert2/package.json b/npm/packs/sweetalert2/package.json index 620644ec70..59a800f66f 100644 --- a/npm/packs/sweetalert2/package.json +++ b/npm/packs/sweetalert2/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/sweetalert2", "publishConfig": { "access": "public" @@ -10,7 +10,7 @@ "directory": "npm/packs/sweetalert2" }, "dependencies": { - "@abp/core": "~7.4.0-rc.4", + "@abp/core": "~7.4.0-rc.5", "sweetalert2": "^11.3.6" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/timeago/package.json b/npm/packs/timeago/package.json index d2678b5764..f26c4a2a36 100644 --- a/npm/packs/timeago/package.json +++ b/npm/packs/timeago/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/timeago", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~7.4.0-rc.4", + "@abp/jquery": "~7.4.0-rc.5", "timeago": "^1.6.7" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/toastr/package.json b/npm/packs/toastr/package.json index fc533243b9..c848084562 100644 --- a/npm/packs/toastr/package.json +++ b/npm/packs/toastr/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/toastr", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~7.4.0-rc.4", + "@abp/jquery": "~7.4.0-rc.5", "toastr": "^2.1.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/tui-editor/package.json b/npm/packs/tui-editor/package.json index 9eb7cfec87..5885ae81ca 100644 --- a/npm/packs/tui-editor/package.json +++ b/npm/packs/tui-editor/package.json @@ -1,12 +1,12 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/tui-editor", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~7.4.0-rc.4", - "@abp/prismjs": "~7.4.0-rc.4" + "@abp/jquery": "~7.4.0-rc.5", + "@abp/prismjs": "~7.4.0-rc.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/uppy/package.json b/npm/packs/uppy/package.json index 24e4781990..f82be2d8c4 100644 --- a/npm/packs/uppy/package.json +++ b/npm/packs/uppy/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/uppy", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~7.4.0-rc.4", + "@abp/core": "~7.4.0-rc.5", "uppy": "^1.16.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/utils/package.json b/npm/packs/utils/package.json index fd6cad056d..8472f18a1c 100644 --- a/npm/packs/utils/package.json +++ b/npm/packs/utils/package.json @@ -1,6 +1,6 @@ { "name": "@abp/utils", - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "scripts": { "prepublishOnly": "yarn install --ignore-scripts && node prepublish.js", "ng": "ng", diff --git a/npm/packs/vee-validate/package.json b/npm/packs/vee-validate/package.json index ceef3bd64f..52b664a1cb 100644 --- a/npm/packs/vee-validate/package.json +++ b/npm/packs/vee-validate/package.json @@ -1,11 +1,11 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/vee-validate", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/vue": "~7.4.0-rc.4", + "@abp/vue": "~7.4.0-rc.5", "vee-validate": "~3.4.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/virtual-file-explorer/package.json b/npm/packs/virtual-file-explorer/package.json index 1572c75b6b..a4883dad6b 100644 --- a/npm/packs/virtual-file-explorer/package.json +++ b/npm/packs/virtual-file-explorer/package.json @@ -1,12 +1,12 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/virtual-file-explorer", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/clipboard": "~7.4.0-rc.4", - "@abp/prismjs": "~7.4.0-rc.4" + "@abp/clipboard": "~7.4.0-rc.5", + "@abp/prismjs": "~7.4.0-rc.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/vue/package.json b/npm/packs/vue/package.json index 31eeb56739..fa4c562d34 100644 --- a/npm/packs/vue/package.json +++ b/npm/packs/vue/package.json @@ -1,5 +1,5 @@ { - "version": "7.4.0-rc.4", + "version": "7.4.0-rc.5", "name": "@abp/vue", "publishConfig": { "access": "public" diff --git a/source-code/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip b/source-code/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip index 0b8eba2d12..4e3ec714dc 100644 Binary files a/source-code/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip and b/source-code/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip differ diff --git a/source-code/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip b/source-code/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip index b01d03e440..c2c4041964 100644 Binary files a/source-code/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip and b/source-code/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip differ diff --git a/source-code/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip b/source-code/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip index e52fb98321..37a7bd616a 100644 Binary files a/source-code/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip and b/source-code/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip differ diff --git a/source-code/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.zip b/source-code/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.zip index 4607d1d954..c68b507670 100644 Binary files a/source-code/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.zip and b/source-code/Volo.Abp.BasicTheme.SourceCode/Volo.Abp.BasicTheme.SourceCode.zip differ diff --git a/source-code/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip b/source-code/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip index 6f759f7c11..0a06435472 100644 Binary files a/source-code/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip and b/source-code/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip differ diff --git a/source-code/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip b/source-code/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip index 5d08347411..8184d73e47 100644 Binary files a/source-code/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip and b/source-code/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip differ diff --git a/source-code/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip b/source-code/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip index ed194cf960..a186918f43 100644 Binary files a/source-code/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip and b/source-code/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip differ diff --git a/source-code/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip b/source-code/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip index 69057d286b..aa67c4b579 100644 Binary files a/source-code/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip and b/source-code/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip differ diff --git a/source-code/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip b/source-code/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip index 0b881fda3b..a4381ff9d0 100644 Binary files a/source-code/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip and b/source-code/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip differ diff --git a/source-code/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip b/source-code/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip index 8019ec7c54..b4ea549f05 100644 Binary files a/source-code/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip and b/source-code/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip differ diff --git a/source-code/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip b/source-code/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip index 1e358546c7..c87cd3e596 100644 Binary files a/source-code/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip and b/source-code/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip differ diff --git a/source-code/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip b/source-code/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip index 54b43afda0..2fe1675e19 100644 Binary files a/source-code/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip and b/source-code/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip differ diff --git a/source-code/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip b/source-code/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip index cd9b8cbd82..58bd63efed 100644 Binary files a/source-code/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip and b/source-code/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip differ diff --git a/source-code/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip b/source-code/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip index 4488aef862..2e9d140184 100644 Binary files a/source-code/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip and b/source-code/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip differ diff --git a/source-code/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip b/source-code/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip index ebf57d6f3d..06b2b59786 100644 Binary files a/source-code/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip and b/source-code/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip differ diff --git a/source-code/Volo.ClientSimulation.SourceCode/Volo.ClientSimulation.SourceCode.zip b/source-code/Volo.ClientSimulation.SourceCode/Volo.ClientSimulation.SourceCode.zip index be51c03fa2..5c20781a94 100644 Binary files a/source-code/Volo.ClientSimulation.SourceCode/Volo.ClientSimulation.SourceCode.zip and b/source-code/Volo.ClientSimulation.SourceCode/Volo.ClientSimulation.SourceCode.zip differ diff --git a/source-code/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip b/source-code/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip index 593b5c7ab6..108b59c89d 100644 Binary files a/source-code/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip and b/source-code/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip differ diff --git a/source-code/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip b/source-code/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip index 36df03e452..6a05999819 100644 Binary files a/source-code/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip and b/source-code/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip differ diff --git a/templates/app-nolayers/angular/package.json b/templates/app-nolayers/angular/package.json index a519d05807..14ca6210ca 100644 --- a/templates/app-nolayers/angular/package.json +++ b/templates/app-nolayers/angular/package.json @@ -12,15 +12,15 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~7.4.0-rc.4", - "@abp/ng.components": "~7.4.0-rc.4", - "@abp/ng.core": "~7.4.0-rc.4", - "@abp/ng.oauth": "~7.4.0-rc.4", - "@abp/ng.identity": "~7.4.0-rc.4", - "@abp/ng.setting-management": "~7.4.0-rc.4", - "@abp/ng.tenant-management": "~7.4.0-rc.4", - "@abp/ng.theme.shared": "~7.4.0-rc.4", - "@abp/ng.theme.lepton-x": "~2.4.0-rc.3", + "@abp/ng.account": "~7.4.0-rc.5", + "@abp/ng.components": "~7.4.0-rc.5", + "@abp/ng.core": "~7.4.0-rc.5", + "@abp/ng.oauth": "~7.4.0-rc.5", + "@abp/ng.identity": "~7.4.0-rc.5", + "@abp/ng.setting-management": "~7.4.0-rc.5", + "@abp/ng.tenant-management": "~7.4.0-rc.5", + "@abp/ng.theme.shared": "~7.4.0-rc.5", + "@abp/ng.theme.lepton-x": "~2.4.0-rc.4", "@angular/animations": "~16.0.0", "@angular/common": "~16.0.0", "@angular/compiler": "~16.0.0", @@ -36,7 +36,7 @@ "zone.js": "~0.13.0" }, "devDependencies": { - "@abp/ng.schematics": "~7.4.0-rc.4", + "@abp/ng.schematics": "~7.4.0-rc.5", "@angular-devkit/build-angular": "~16.0.0", "@angular-eslint/builder": "~16.0.0", "@angular-eslint/eslint-plugin": "~16.0.0", diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj index a841a8ef71..8257127d6b 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj @@ -22,8 +22,8 @@ - - + + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json index 0a3d3d3a51..b9beae2ef2 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.components.server.leptonxlitetheme": "~2.4.0-rc.2", - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.0-rc.2" + "@abp/aspnetcore.components.server.leptonxlitetheme": "~2.4.0-rc.4", + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.0-rc.4" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj index a05ab97793..50490047bd 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj @@ -22,8 +22,8 @@ - - + + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json index 5ca233518c..cd5f25b790 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.0-rc.2", - "@abp/aspnetcore.components.server.leptonxlitetheme": "~2.4.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.0-rc.4", + "@abp/aspnetcore.components.server.leptonxlitetheme": "~2.4.0-rc.4" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyCompanyName.MyProjectName.Blazor.WebAssembly.Client.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyCompanyName.MyProjectName.Blazor.WebAssembly.Client.csproj index fa8d0bb142..a27b73e45c 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyCompanyName.MyProjectName.Blazor.WebAssembly.Client.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyCompanyName.MyProjectName.Blazor.WebAssembly.Client.csproj @@ -21,7 +21,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.Mongo.csproj index 37e212b973..1a39e90fc9 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.Mongo.csproj @@ -74,7 +74,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json index 90a2aa54db..df64c1f21d 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.0-rc.4" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.csproj index 81e6e75159..cb861bf4d6 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.csproj @@ -75,7 +75,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json index 90a2aa54db..df64c1f21d 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.0-rc.4" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj index 311c8009ee..9a9d209e34 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj @@ -70,7 +70,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json index 90a2aa54db..df64c1f21d 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.0-rc.4" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj index 003a0671fe..199372c6b0 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj @@ -71,7 +71,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json index 90a2aa54db..df64c1f21d 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.0-rc.4" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj index 352e10f03a..84c1e4f9e3 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj @@ -18,7 +18,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json index 90a2aa54db..df64c1f21d 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.0-rc.4" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj index 17d81a76d1..9daaa4b015 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj @@ -18,7 +18,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json index 90a2aa54db..df64c1f21d 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.0-rc.4" } } diff --git a/templates/app-nolayers/aspnet-core/README.md b/templates/app-nolayers/aspnet-core/README.md index 9e142b3119..c0b1a5e76d 100644 --- a/templates/app-nolayers/aspnet-core/README.md +++ b/templates/app-nolayers/aspnet-core/README.md @@ -1,18 +1,49 @@ -## About this solution +# MyCompanyName.MyProjectName + +## About This Solution This is a minimalist, non-layered startup solution with the ABP Framework. All the fundamental ABP modules are already installed. -## How to run +## Before Running the Solution + +### Generating a Signing Certificate + +In the production environment, you need to use a production signing certificate. ABP Framework sets up signing and encryption certificates in your application and expects an `openiddict.pfx` file in your application. + +This certificate is already generated by ABP CLI, so most of the time you don't need to generate it yourself. However, if you need to generate a certificate, you can use the following command: + +```bash +dotnet dev-certs https -v -ep openiddict.pfx -p 00000000-0000-0000-0000-000000000000 +``` + +> `00000000-0000-0000-0000-000000000000` is the password of the certificate, you can change it to any password you want. + +It is recommended to use **two** RSA certificates, distinct from the certificate(s) used for HTTPS: one for encryption, one for signing. + +For more information, please refer to: https://documentation.openiddict.com/configuration/encryption-and-signing-credentials.html#registering-a-certificate-recommended-for-production-ready-scenarios -The application needs to connect to a database. Run the following command in the `MyCompanyName.MyProjectName` directory: +> Also, see the [Configuring OpenIddict](https://docs.abp.io/en/abp/latest/Deployment/Configuring-OpenIddict#production-environment) documentation for more information. + +### Install Client-Side Libraries + +Run the following command in the directory of your final application: + +```bash +abp install-libs +``` + +> This command installs all NPM packages for MVC/Razor Pages and Blazor Server UIs and this command is already run by the ABP CLI, so most of the time you don't need to run this command manually. + +## How to Run + +The application needs to connect to a database. Run the following command in the `MyCompanyName.MyProjectName` directory to migrate the database and seed the initial data: ````bash dotnet run --migrate-database ```` -This will create and seed the initial database. Then you can run the application with any IDE that supports .NET. - -Happy coding..! - +This command will create and seed the initial database. Then you can run the application with any IDE that supports .NET. +## Deploying the Application +Deploying an ABP application is not different than deploying any .NET or ASP.NET Core application. However, there are some topics that you should care about when you are deploying your applications. You can check ABP's [Deployment documentation](https://docs.abp.io/en/abp/latest/Deployment/Index) before deploying your application. diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index e44f77fafd..ae0cd083c0 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -12,15 +12,15 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~7.4.0-rc.4", - "@abp/ng.components": "~7.4.0-rc.4", - "@abp/ng.core": "~7.4.0-rc.4", - "@abp/ng.oauth": "~7.4.0-rc.4", - "@abp/ng.identity": "~7.4.0-rc.4", - "@abp/ng.setting-management": "~7.4.0-rc.4", - "@abp/ng.tenant-management": "~7.4.0-rc.4", - "@abp/ng.theme.shared": "~7.4.0-rc.4", - "@abp/ng.theme.lepton-x": "~2.4.0-rc.3", + "@abp/ng.account": "~7.4.0-rc.5", + "@abp/ng.components": "~7.4.0-rc.5", + "@abp/ng.core": "~7.4.0-rc.5", + "@abp/ng.oauth": "~7.4.0-rc.5", + "@abp/ng.identity": "~7.4.0-rc.5", + "@abp/ng.setting-management": "~7.4.0-rc.5", + "@abp/ng.tenant-management": "~7.4.0-rc.5", + "@abp/ng.theme.shared": "~7.4.0-rc.5", + "@abp/ng.theme.lepton-x": "~2.4.0-rc.4", "@angular/animations": "~16.0.0", "@angular/common": "~16.0.0", "@angular/compiler": "~16.0.0", @@ -42,7 +42,7 @@ "@angular-eslint/eslint-plugin-template": "~16.0.0", "@angular-eslint/schematics": "~16.0.0", "@angular-eslint/template-parser": "~16.0.0", - "@abp/ng.schematics": "~7.4.0-rc.4", + "@abp/ng.schematics": "~7.4.0-rc.5", "@angular/cli": "~16.0.0", "@angular/compiler-cli": "~16.0.0", "@angular/language-service": "~16.0.0", diff --git a/templates/app/aspnet-core/README.md b/templates/app/aspnet-core/README.md new file mode 100644 index 0000000000..680579f70b --- /dev/null +++ b/templates/app/aspnet-core/README.md @@ -0,0 +1,39 @@ +# MyCompanyName.MyProjectName + +## About This Solution + +This is a layered startup solution based on [Domain Driven Design (DDD)](https://docs.abp.io/en/abp/latest/Domain-Driven-Design) practises. All the fundamental ABP modules are already installed. Check the [Application Startup Template](https://docs.abp.io/en/abp/latest/Startup-Templates/Application) documentation for more info. + +## Before Running the Solution + +### Generating a Signing Certificate + +In the production environment, you need to use a production signing certificate. ABP Framework sets up signing and encryption certificates in your application and expects an `openiddict.pfx` file in your application. + +This certificate is already generated by ABP CLI, so most of the time you don't need to generate it yourself. However, if you need to generate a certificate, you can use the following command: + +```bash +dotnet dev-certs https -v -ep openiddict.pfx -p 00000000-0000-0000-0000-000000000000 +``` + +> `00000000-0000-0000-0000-000000000000` is the password of the certificate, you can change it to any password you want. + +It is recommended to use **two** RSA certificates, distinct from the certificate(s) used for HTTPS: one for encryption, one for signing. + +For more information, please refer to: https://documentation.openiddict.com/configuration/encryption-and-signing-credentials.html#registering-a-certificate-recommended-for-production-ready-scenarios + +> Also, see the [Configuring OpenIddict](https://docs.abp.io/en/abp/latest/Deployment/Configuring-OpenIddict#production-environment) documentation for more information. + +### Install Client-Side Libraries + +Run the following command in the directory of your final application: + +```bash +abp install-libs +``` + +> This command installs all NPM packages for MVC/Razor Pages and Blazor Server UIs and this command is already run by the ABP CLI, so most of the time you don't need to run this command manually. + +## Deploying the Application + +Deploying an ABP application is not different than deploying any .NET or ASP.NET Core application. However, there are some topics that you should care about when you are deploying your applications. You can check ABP's [Deployment documentation](https://docs.abp.io/en/abp/latest/Deployment/Index) before deploying your application. \ No newline at end of file diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj index 04c8525bc6..ea67a0778a 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj @@ -51,7 +51,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json index 85c4327379..15e9058aeb 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-authserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.0-rc.4" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj index c41e05208f..3e312bf5e7 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj @@ -30,8 +30,8 @@ - - + + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json index 5ca233518c..cd5f25b790 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.0-rc.2", - "@abp/aspnetcore.components.server.leptonxlitetheme": "~2.4.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.0-rc.4", + "@abp/aspnetcore.components.server.leptonxlitetheme": "~2.4.0-rc.4" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj index 8c7e876b30..5c45c31622 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj @@ -28,8 +28,8 @@ - - + + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json index 5ca233518c..cd5f25b790 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.0-rc.2", - "@abp/aspnetcore.components.server.leptonxlitetheme": "~2.4.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.0-rc.4", + "@abp/aspnetcore.components.server.leptonxlitetheme": "~2.4.0-rc.4" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj index 99b7a43f2e..4e797cc8da 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj @@ -24,7 +24,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj index 5786ea57bb..c910fda317 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj @@ -26,7 +26,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json index 90a2aa54db..df64c1f21d 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.0-rc.4" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj index 51a10f4542..b6e3032f88 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj @@ -28,7 +28,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json index 90a2aa54db..df64c1f21d 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.0-rc.4" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj index 6aed7a2fb6..c1cc5a55a3 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj @@ -49,7 +49,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json index 90a2aa54db..df64c1f21d 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.0-rc.4" } } diff --git a/templates/console/src/MyCompanyName.MyProjectName/MyProjectNameHostedService.cs b/templates/console/src/MyCompanyName.MyProjectName/MyProjectNameHostedService.cs index c31bcc282f..3876cac7e2 100644 --- a/templates/console/src/MyCompanyName.MyProjectName/MyProjectNameHostedService.cs +++ b/templates/console/src/MyCompanyName.MyProjectName/MyProjectNameHostedService.cs @@ -7,13 +7,11 @@ namespace MyCompanyName.MyProjectName; public class MyProjectNameHostedService : IHostedService { - private readonly IAbpApplicationWithExternalServiceProvider _abpApplication; private readonly HelloWorldService _helloWorldService; - public MyProjectNameHostedService(HelloWorldService helloWorldService, IAbpApplicationWithExternalServiceProvider abpApplication) + public MyProjectNameHostedService(HelloWorldService helloWorldService) { _helloWorldService = helloWorldService; - _abpApplication = abpApplication; } public async Task StartAsync(CancellationToken cancellationToken) @@ -21,8 +19,8 @@ public class MyProjectNameHostedService : IHostedService await _helloWorldService.SayHelloAsync(); } - public async Task StopAsync(CancellationToken cancellationToken) + public Task StopAsync(CancellationToken cancellationToken) { - await _abpApplication.ShutdownAsync(); + return Task.CompletedTask; } } diff --git a/templates/console/src/MyCompanyName.MyProjectName/Program.cs b/templates/console/src/MyCompanyName.MyProjectName/Program.cs index 79d12b850f..dd1ce382c9 100644 --- a/templates/console/src/MyCompanyName.MyProjectName/Program.cs +++ b/templates/console/src/MyCompanyName.MyProjectName/Program.cs @@ -1,7 +1,9 @@ using System; using System.Threading.Tasks; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Logging; using Serilog; using Serilog.Events; using Volo.Abp; @@ -28,19 +30,20 @@ public class Program { Log.Information("Starting console host."); - var builder = Host.CreateDefaultBuilder(args); + var builder = Host.CreateApplicationBuilder(args); - builder.ConfigureServices(services => - { - services.AddHostedService(); - services.AddApplicationAsync(options => - { - options.Services.ReplaceConfiguration(services.GetConfiguration()); - }); - }).AddAppSettingsSecretsJson().UseSerilog().UseAutofac().UseConsoleLifetime(); + builder.Configuration.AddAppSettingsSecretsJson(); + builder.Logging.ClearProviders().AddSerilog(); + + builder.ConfigureContainer(builder.Services.AddAutofacServiceProviderFactory()); + + builder.Services.AddHostedService(); + + await builder.Services.AddApplicationAsync(); var host = builder.Build(); - await host.Services.GetRequiredService().InitializeAsync(host.Services); + + await host.InitializeAsync(); await host.RunAsync(); diff --git a/templates/console/src/MyCompanyName.MyProjectName/Properties/launchSettings.json b/templates/console/src/MyCompanyName.MyProjectName/Properties/launchSettings.json new file mode 100644 index 0000000000..99027a4bbc --- /dev/null +++ b/templates/console/src/MyCompanyName.MyProjectName/Properties/launchSettings.json @@ -0,0 +1,10 @@ +{ + "profiles": { + "MyCompanyName.MyProjectName": { + "commandName": "Project", + "environmentVariables": { + "DOTNET_ENVIRONMENT": "Development" + } + } + } +} \ No newline at end of file diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index 3d5427f45b..a3483eaed1 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -15,15 +15,15 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~7.4.0-rc.4", - "@abp/ng.components": "~7.4.0-rc.4", - "@abp/ng.core": "~7.4.0-rc.4", - "@abp/ng.oauth": "~7.4.0-rc.4", - "@abp/ng.identity": "~7.4.0-rc.4", - "@abp/ng.setting-management": "~7.4.0-rc.4", - "@abp/ng.tenant-management": "~7.4.0-rc.4", - "@abp/ng.theme.basic": "~7.4.0-rc.4", - "@abp/ng.theme.shared": "~7.4.0-rc.4", + "@abp/ng.account": "~7.4.0-rc.5", + "@abp/ng.components": "~7.4.0-rc.5", + "@abp/ng.core": "~7.4.0-rc.5", + "@abp/ng.oauth": "~7.4.0-rc.5", + "@abp/ng.identity": "~7.4.0-rc.5", + "@abp/ng.setting-management": "~7.4.0-rc.5", + "@abp/ng.tenant-management": "~7.4.0-rc.5", + "@abp/ng.theme.basic": "~7.4.0-rc.5", + "@abp/ng.theme.shared": "~7.4.0-rc.5", "@angular/animations": "~16.0.0", "@angular/common": "~16.0.0", "@angular/compiler": "~16.0.0", @@ -38,7 +38,7 @@ "zone.js": "~0.13.0" }, "devDependencies": { - "@abp/ng.schematics": "~7.4.0-rc.4", + "@abp/ng.schematics": "~7.4.0-rc.5", "@angular-devkit/build-angular": "~16.0.0", "@angular-eslint/builder": "~16.0.0", "@angular-eslint/eslint-plugin": "~16.0.0", diff --git a/templates/module/angular/projects/my-project-name/package.json b/templates/module/angular/projects/my-project-name/package.json index f559a1053c..810211af08 100644 --- a/templates/module/angular/projects/my-project-name/package.json +++ b/templates/module/angular/projects/my-project-name/package.json @@ -4,8 +4,8 @@ "peerDependencies": { "@angular/common": ">=14", "@angular/core": ">=14", - "@abp/ng.core": ">=7.4.0-rc.4", - "@abp/ng.theme.shared": ">=7.4.0-rc.4" + "@abp/ng.core": ">=7.4.0-rc.5", + "@abp/ng.theme.shared": ">=7.4.0-rc.5" }, "dependencies": { "tslib": "^2.1.0" diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json index 3149a7612c..60579190e2 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-authserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.5" } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json index 2933fd7ef0..1599304eea 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.4", - "@abp/aspnetcore.components.server.basictheme": "~7.4.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.5", + "@abp/aspnetcore.components.server.basictheme": "~7.4.0-rc.5" } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json index 704a94ab02..d821bb0862 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.5" } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json index 704a94ab02..d821bb0862 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.4" + "@abp/aspnetcore.mvc.ui.theme.basic": "~7.4.0-rc.5" } }