diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 081275ca08..1d9a8750e6 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -1,13 +1,13 @@ -name: Merge branch dev with rel-5.3 +name: Merge branch dev with rel-6.0 on: push: branches: - - rel-5.3 + - rel-6.0 permissions: contents: read jobs: - merge-rel-5-3-with-rel-5-2: + merge-dev-with-rel-6-0: permissions: contents: write # for peter-evans/create-pull-request to create branch pull-requests: write # for peter-evans/create-pull-request to create a PR @@ -18,13 +18,13 @@ jobs: ref: dev - name: Reset promotion branch run: | - git fetch origin rel-5.3:rel-5.3 - git reset --hard rel-5.3 + git fetch origin rel-6.0:rel-6.0 + git reset --hard rel-6.0 - name: Create Pull Request uses: peter-evans/create-pull-request@v3 with: - branch: auto-merge/rel-5-3/${{github.run_number}} - title: Merge branch dev with rel-5.3 - body: This PR generated automatically to merge dev with rel-5.3. Please review the changed files before merging to prevent any errors that may occur. + branch: auto-merge/rel-6-0/${{github.run_number}} + title: Merge branch dev with rel-6.0 + body: This PR generated automatically to merge dev with rel-6.0. Please review the changed files before merging to prevent any errors that may occur. reviewers: ${{github.actor}} token: ${{ github.token }} diff --git a/docs/en/Background-Workers.md b/docs/en/Background-Workers.md index 286d6ab7b0..6206e2fbd1 100644 --- a/docs/en/Background-Workers.md +++ b/docs/en/Background-Workers.md @@ -128,7 +128,7 @@ Be careful if you run multiple instances of your application simultaneously in a If that's a problem for your workers, you have the following options: -* Implement your background workers so that they work in a clustered environment without any problem. Using the [distributed lock](../Distributed-Locking.md) to ensure concurrency control is a way of doing that. A background worker in an application instance may handle a distributed lock, so the workers in other application instances will wait for the lock. In this way, only one worker does the actual work, while others wait in idle. If you implement this, your workers run safely without caring about how the application is deployed. +* Implement your background workers so that they work in a clustered environment without any problem. Using the [distributed lock](Distributed-Locking.md) to ensure concurrency control is a way of doing that. A background worker in an application instance may handle a distributed lock, so the workers in other application instances will wait for the lock. In this way, only one worker does the actual work, while others wait in idle. If you implement this, your workers run safely without caring about how the application is deployed. * Stop the background workers (set `AbpBackgroundWorkerOptions.IsEnabled` to `false`) in all application instances except one of them, so only the single instance runs the workers. * Stop the background workers (set `AbpBackgroundWorkerOptions.IsEnabled` to `false`) in all application instances and create a dedicated application (maybe a console application running in its own container or a Windows Service running in the background) to execute all the background tasks. This can be a good option if your background workers consume high system resources (CPU, RAM or Disk), so you can deploy that background application to a dedicated server and your background tasks don't affect your application's performance. diff --git a/docs/en/Community-Articles/2020-09-09-Replacing-Email-Template-and-Sending-Emails/POST.md b/docs/en/Community-Articles/2020-09-09-Replacing-Email-Template-and-Sending-Emails/POST.md index 049171731b..f412ca3170 100644 --- a/docs/en/Community-Articles/2020-09-09-Replacing-Email-Template-and-Sending-Emails/POST.md +++ b/docs/en/Community-Articles/2020-09-09-Replacing-Email-Template-and-Sending-Emails/POST.md @@ -335,7 +335,7 @@ After sending the email we should see the template like below.
-

Share your experiences with the ABP Framework!
ABP is an open source and community driven project. This guide is aims to help anyone wants to contribute to the project.

+

Share your experiences with the ABP Framework!
ABP is an open source and community driven project. This guide is aimed to help anyone who wants to contribute to the project.

If you want to write articles or "how to" guides related to the ABP Framework and ASP.NET Core, please submit your article to the community.abp.io web site.

diff --git a/docs/en/SMS-Sending.md b/docs/en/SMS-Sending.md index 0dca487a69..efe63c3c91 100644 --- a/docs/en/SMS-Sending.md +++ b/docs/en/SMS-Sending.md @@ -80,7 +80,7 @@ The given `SendAsync` method in the example is an extension method to send an SM ## NullSmsSender -`NullSmsSender` is a the default implementation of the `ISmsSender`. It writes SMS content to the [standard logler](Logging.md), rather than actually sending the SMS. +`NullSmsSender` is a the default implementation of the `ISmsSender`. It writes SMS content to the [standard logger](Logging.md), rather than actually sending the SMS. This class can be useful especially in development time where you generally don't want to send real SMS. **However, if you want to actually send SMS, you should implement the `ISmsSender` in your application code.** diff --git a/docs/en/Themes/LeptonXLite/AspNetCore.md b/docs/en/Themes/LeptonXLite/AspNetCore.md index 5c2c515613..eeaf55f545 100644 --- a/docs/en/Themes/LeptonXLite/AspNetCore.md +++ b/docs/en/Themes/LeptonXLite/AspNetCore.md @@ -7,6 +7,8 @@ LeptonX Lite has implementation for the ABP Framework Razor Pages. It's a simpli ## Installation +This theme is **already installed** when you create a new solution using the startup templates. If you are using any other template, you can install this theme by following the steps below: + - Add **Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite** package to your **Web** application. ```bash diff --git a/docs/en/Themes/LeptonXLite/angular.md b/docs/en/Themes/LeptonXLite/angular.md index 3edb7e6b1a..506ffaf753 100644 --- a/docs/en/Themes/LeptonXLite/angular.md +++ b/docs/en/Themes/LeptonXLite/angular.md @@ -7,6 +7,8 @@ LeptonX Lite has implementation for the ABP Framework Angular Client. It's a sim ## Installation +This theme is **already installed** when you create a new solution using the startup templates. If you are using any other template, you can install this theme by following the steps below: + To add `LeptonX-lite` into your project, * Install `@abp/ng.theme.lepton-x` diff --git a/docs/en/Themes/LeptonXLite/blazor.md b/docs/en/Themes/LeptonXLite/blazor.md index 22bc4af285..636c33ef28 100644 --- a/docs/en/Themes/LeptonXLite/blazor.md +++ b/docs/en/Themes/LeptonXLite/blazor.md @@ -15,6 +15,8 @@ LeptonX Lite has implementation for the ABP Framework Blazor WebAssembly & Blazo ## Installation +This theme is **already installed** when you create a new solution using the startup templates. If you are using any other template, you can install this theme by following the steps below: + {{if UI == "Blazor"}} - Complete the [MVC Razor Pages Installation](AspNetCore.md#installation) for the **HttpApi.Host** application first. _If the solution is tiered/micro-service, complete the MVC steps for all MVC applications such as **HttpApi.Host** and if identity server is separated, install to the **OpenIddict**_. diff --git a/docs/en/UI/Angular/Basic-Theme.md b/docs/en/UI/Angular/Basic-Theme.md index 7b6c98fdcc..6b9ffcfeb1 100644 --- a/docs/en/UI/Angular/Basic-Theme.md +++ b/docs/en/UI/Angular/Basic-Theme.md @@ -8,7 +8,7 @@ The Basic Theme is a theme implementation for the Angular UI. It is a minimalist ## Installation -**This theme is already installed** when you create a new solution using the [startup templates](../../Startup-Templates/Index.md). If you need to manually install it, follow the steps below: +If you need to manually this theme, follow the steps below: * Install the [@abp/ng.theme.basic](https://www.npmjs.com/package/@abp/ng.theme.basic) NPM package to your Angular project. * Open the `src/app/app.module.ts` file, import `ThemeBasicModule` (it can be imported from `@abp/ng.theme.basic` package), and add `ThemeBasicModule.forRoot()` to the `imports` array. diff --git a/docs/en/UI/Angular/Config-State-Service.md b/docs/en/UI/Angular/Config-State-Service.md index b3884f65e1..11415eb771 100644 --- a/docs/en/UI/Angular/Config-State-Service.md +++ b/docs/en/UI/Angular/Config-State-Service.md @@ -122,8 +122,8 @@ You can get the application configuration response and set the `ConfigStateServi ```js import {ApplicationConfigurationService, ConfigStateService} from '@abp/ng.core'; -constructor(private applicationConfigurationService: ApplicationConfigurationService, private config: ConfigStateService) { - this.applicationConfigurationService.getConfiguration().subscribe(config => { +constructor(private abpApplicationConfigurationService: AbpApplicationConfigurationService, private config: ConfigStateService) { + this.abpApplicationConfigurationService.get().subscribe(config => { this.config.setState(config); }) } diff --git a/docs/en/UI/AspNetCore/Basic-Theme.md b/docs/en/UI/AspNetCore/Basic-Theme.md index e74799a423..903231a20a 100644 --- a/docs/en/UI/AspNetCore/Basic-Theme.md +++ b/docs/en/UI/AspNetCore/Basic-Theme.md @@ -10,7 +10,7 @@ The Basic Theme has RTL (Right-to-Left language) support. ## Installation -**This theme is already installed** when you create a new solution using the [startup templates](../../Startup-Templates/Index.md). If you need to manually install it, follow the steps below: +If you need to manually this theme, follow the steps below: * Install the [Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic](https://www.nuget.org/packages/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic) NuGet package to your web project. * Add `AbpAspNetCoreMvcUiBasicThemeModule` into the `[DependsOn(...)]` attribute for your [module class](../../Module-Development-Basics.md) in the web project. diff --git a/docs/en/UI/Blazor/Basic-Theme.md b/docs/en/UI/Blazor/Basic-Theme.md index 2cd0914e2f..4060f097ba 100644 --- a/docs/en/UI/Blazor/Basic-Theme.md +++ b/docs/en/UI/Blazor/Basic-Theme.md @@ -15,7 +15,7 @@ The Basic Theme is a theme implementation for the Blazor UI. It is a minimalist ## Installation -**This theme is already installed** when you create a new solution using the [startup templates](../../Startup-Templates/Index.md). If you need to manually install it, follow the steps below: +If you need to manually this theme, follow the steps below: {{if UI == "Blazor"}} diff --git a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs index 7e8f90a397..c51ec76fc1 100644 --- a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs +++ b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs @@ -20,7 +20,9 @@ namespace Volo.Abp.Caching; /// Represents a distributed cache of type. /// /// The type of cache item being cached. -public class DistributedCache : DistributedCache, IDistributedCache +public class DistributedCache : + DistributedCache, + IDistributedCache where TCacheItem : class { public DistributedCache( diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs index 7090853734..026b4ca48c 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs @@ -103,12 +103,18 @@ public abstract class ProjectCreationCommandBase Logger.LogInformation("UI Framework: " + uiFramework); } - var theme = uiFramework == UiFramework.None ? (Theme?)null : GetTheme(commandLineArgs); + var theme = uiFramework == UiFramework.None ? (Theme?)null : GetThemeByTemplateOrNull(commandLineArgs, template); if (theme.HasValue) { Logger.LogInformation("Theme: " + theme); } + var themeStyle = theme.HasValue ? GetThemeStyleOrNull(commandLineArgs, theme.Value) : (ThemeStyle?)null; + if(themeStyle.HasValue) + { + Logger.LogInformation("Theme Style: " + themeStyle); + } + var publicWebSite = uiFramework != UiFramework.None && commandLineArgs.Options.ContainsKey(Options.PublicWebSite.Long); if (publicWebSite) { @@ -221,7 +227,8 @@ public abstract class ProjectCreationCommandBase commandLineArgs.Options, connectionString, pwa, - theme + theme, + themeStyle ); } @@ -360,7 +367,7 @@ public abstract class ProjectCreationCommandBase return DatabaseProvider.MongoDb; } - throw new CliUsageException("The option you provided for Database Provider is invalid!"); + throw new CliUsageException(ExceptionMessageHelper.GetInvalidOptionExceptionMessage("Database Provider")); } protected virtual async Task RunGraphBuildForMicroserviceServiceTemplate(ProjectBuildArgs projectArgs) @@ -471,7 +478,7 @@ public abstract class ProjectCreationCommandBase case "oracle": return DatabaseManagementSystem.Oracle; default: - throw new CliUsageException("The option you provided for Database Management System is invalid!"); + throw new CliUsageException(ExceptionMessageHelper.GetInvalidOptionExceptionMessage("Database Management System")); } } @@ -487,7 +494,7 @@ public abstract class ProjectCreationCommandBase case "react-native": return MobileApp.ReactNative; default: - throw new CliUsageException("The option you provided for Mobile App is invalid!"); + throw new CliUsageException(ExceptionMessageHelper.GetInvalidOptionExceptionMessage("Mobile App")); } } @@ -515,23 +522,59 @@ public abstract class ProjectCreationCommandBase case "blazor-server": return UiFramework.BlazorServer; default: - throw new CliUsageException("The option you provided for UI Framework is invalid!"); + throw new CliUsageException(ExceptionMessageHelper.GetInvalidOptionExceptionMessage("UI Framework")); } } - protected virtual Theme GetTheme(CommandLineArgs commandLineArgs) + protected virtual Theme? GetThemeByTemplateOrNull(CommandLineArgs commandLineArgs, string template = "app") { - var optionValue = commandLineArgs.Options.GetOrNull(Options.Theme.Long); - switch (optionValue) + var theme = commandLineArgs.Options.GetOrNull(Options.Theme.Long)?.ToLower(); + + return template switch { - case null: - case "leptonx-lite": - return Theme.LeptonXLite; - case "basic": - return Theme.Basic; - default: - throw new CliUsageException("The option you provided for Theme is invalid!"); + AppTemplate.TemplateName or AppNoLayersTemplate.TemplateName => GetAppTheme(), + AppProTemplate.TemplateName or AppNoLayersProTemplate.TemplateName or MicroserviceProTemplate.TemplateName => GetAppProTheme(), + _ => null + }; + + Theme GetAppTheme() + { + return theme switch + { + // null or "leptonx-lite" => Theme.LeptonXLite, + "basic" => Theme.Basic, + _ => Theme.LeptonXLite + }; } + + Theme GetAppProTheme() + { + return theme switch + { + // null or "leptonx" => Theme.LeptonX, + "lepton" => Theme.Lepton, + "basic" => Theme.Basic, + _ => Theme.LeptonX //TODO: default??? + }; + } + } + + protected virtual ThemeStyle? GetThemeStyleOrNull(CommandLineArgs commandLineArgs, Theme theme) + { + if(theme != Theme.LeptonX) + { + return null; + } + + var themeStyle = commandLineArgs.Options.GetOrNull(Options.ThemeStyle.Long)?.ToLower(); + return themeStyle switch + { + // null => ThemeStyle.NotSpecified, TODO: remove it!!! + "dim" or null => ThemeStyle.Dim, + "light" => ThemeStyle.Light, + "dark" => ThemeStyle.Dark, + _ => null + }; } protected void ConfigureNpmPackagesForTheme(ProjectBuildArgs projectArgs) @@ -546,6 +589,15 @@ public abstract class ProjectCreationCommandBase case Theme.Basic: ConfigureNpmPackagesForBasicTheme(projectArgs); break; + case Theme.Lepton: + ConfigureNpmPackagesForLeptonTheme(projectArgs); + break; + case Theme.NotSpecified: + case Theme.LeptonXLite: + case Theme.LeptonX: + break; + default: + throw new CliUsageException(ExceptionMessageHelper.GetInvalidOptionExceptionMessage(Options.Theme.Long)); } } @@ -566,6 +618,25 @@ public abstract class ProjectCreationCommandBase ThemePackageAdder.AddAngularPackage(projectArgs.OutputFolder, "@abp/ng.theme.basic", projectArgs.Version); } } + + private void ConfigureNpmPackagesForLeptonTheme(ProjectBuildArgs projectArgs) + { + if (projectArgs.UiFramework is not UiFramework.None or UiFramework.Angular) + { + ThemePackageAdder.AddNpmPackage(projectArgs.OutputFolder, "@volo/abp.aspnetcore.mvc.ui.theme.lepton", projectArgs.Version); + } + + if (projectArgs.UiFramework is UiFramework.BlazorServer) + { + ThemePackageAdder.AddNpmPackage(projectArgs.OutputFolder, "@volo/abp.aspnetcore.components.server.leptontheme", projectArgs.Version); + ThemePackageAdder.AddNpmPackage(projectArgs.OutputFolder, "@volo/abp.aspnetcore.mvc.ui.theme.lepton", projectArgs.Version); + } + + if (projectArgs.UiFramework is UiFramework.Angular) + { + ThemePackageAdder.AddAngularPackage(projectArgs.OutputFolder, "@volo/abp.ng.theme.lepton", projectArgs.Version); + } + } public static class Options { @@ -669,5 +740,10 @@ public abstract class ProjectCreationCommandBase { public const string Long = "theme"; } + + public static class ThemeStyle + { + public const string Long = "theme-style"; + } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs index 4409f258b3..dcf8496e66 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs @@ -1,5 +1,10 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; +using System.Xml; +using Volo.Abp.Cli.ProjectBuilding.Files; +using Volo.Abp.Cli.ProjectBuilding.Templates.App; +using Volo.Abp.Cli.Utils; namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps; @@ -17,419 +22,131 @@ public class ChangeThemeStep : ProjectBuildPipelineStep case Theme.Basic: ChangeToBasicTheme(context); break; + case Theme.Lepton: + ChangeToLeptonTheme(context); + break; } } protected void ChangeToBasicTheme(ProjectBuildContext context) { - #region MyCompanyName.MyProjectName.Web - - ReplacePackageReferenceWithProjectReference( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite", - @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" - ); + var defaultThemeName = context.BuildArgs.TemplateName is AppTemplate.TemplateName or AppNoLayersTemplate.TemplateName + ? "LeptonXLite" + : "LeptonX"; - ChangeNamespaceAndKeyword( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic", - "AbpAspNetCoreMvcUiLeptonXLiteThemeModule", - "AbpAspNetCoreMvcUiBasicThemeModule" - ); + #region MVC Projects - ChangeNamespaceAndKeyword( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling", - "LeptonXLiteThemeBundles.Styles.Global", - "BasicThemeBundles.Styles.Global" - ); + ChangeThemeToBasicForMvcProjects(context, defaultThemeName); #endregion - - #region MyCompanyName.MyProjectName.HttpApi.Host - - ReplacePackageReferenceWithProjectReference( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite", - @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" - ); - - ChangeNamespaceAndKeyword( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic", - "AbpAspNetCoreMvcUiLeptonXLiteThemeModule", - "AbpAspNetCoreMvcUiBasicThemeModule" - ); - - ChangeNamespaceAndKeyword( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling", - "LeptonXLiteThemeBundles.Styles.Global", - "BasicThemeBundles.Styles.Global" - ); - #endregion - #region MyCompanyName.MyProjectName.Blazor ReplacePackageReferenceWithProjectReference( context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj", - "Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme", + "/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj", + $"Volo.Abp.AspNetCore.Components.WebAssembly.{defaultThemeName}Theme", @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme\Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.csproj" ); ChangeNamespaceAndKeyword( context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs", - "Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme", + "/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs", + $"Volo.Abp.AspNetCore.Components.WebAssembly.{defaultThemeName}Theme", "Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme", - "AbpAspNetCoreComponentsWebAssemblyLeptonXLiteThemeModule", + $"AbpAspNetCoreComponentsWebAssembly{defaultThemeName}ThemeModule", "AbpAspNetCoreComponentsWebAssemblyBasicThemeModule" ); ChangeNamespace( context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs", - "Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite", + "/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs", + $"Volo.Abp.AspNetCore.Components.Web.{defaultThemeName}Theme.Themes.{defaultThemeName}", "Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic" ); #endregion - #region MyCompanyName.MyProjectName.Blazor.Server - ReplacePackageReferenceWithProjectReference( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj", - "Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme", - @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" - ); + #region Blazor.Server Projects - ReplacePackageReferenceWithProjectReference( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite", - @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.Server.BasicTheme\Volo.Abp.AspNetCore.Components.Server.BasicTheme.csproj" - ); - - ChangeNamespaceAndKeyword( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs", - "Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme", - "Volo.Abp.AspNetCore.Components.Server.BasicTheme", - "AbpAspNetCoreComponentsServerLeptonXLiteThemeModule", - "AbpAspNetCoreComponentsServerBasicThemeModule" - ); - - ChangeNamespaceAndKeyword( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic", - "AbpAspNetCoreMvcUiLeptonXLiteThemeModule", - "AbpAspNetCoreMvcUiBasicThemeModule" - ); - - ChangeNamespaceAndKeyword( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs", - "Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling", - "Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling", - "LeptonXLiteThemeBundles.Styles.Global", - "BasicThemeBundles.Styles.Global" - ); - - ChangeNamespaceAndKeyword( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling", - "BlazorLeptonXLiteThemeBundles.Styles.Global", - "BlazorBasicThemeBundles.Styles.Global" - ); - - ChangeNamespaceAndKeyword( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/_Host.cshtml", - "Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite", - "Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic", - "BlazorLeptonXLiteThemeBundles.Styles.Global", - "BlazorBasicThemeBundles.Styles.Global" - ); - - ChangeNamespaceAndKeyword( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/_Host.cshtml", - "Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling", - "Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling", - "BlazorLeptonXLiteThemeBundles.Scripts.Global", - "BlazorBasicThemeBundles.Scripts.Global" - ); + ChangeThemeToBasicForBlazorServerProjects(context, defaultThemeName); #endregion - - #region MyCompanyName.MyProjectName.Blazor.Server.Tiered - ReplacePackageReferenceWithProjectReference( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj", - "Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme", - @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" - ); + #region Angular - ReplacePackageReferenceWithProjectReference( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite", - @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.Server.BasicTheme\Volo.Abp.AspNetCore.Components.Server.BasicTheme.csproj" - ); - - ChangeNamespaceAndKeyword( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs", - "Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme", - "Volo.Abp.AspNetCore.Components.Server.BasicTheme", - "AbpAspNetCoreComponentsServerLeptonXLiteThemeModule", - "AbpAspNetCoreComponentsServerBasicThemeModule" - ); - - ChangeNamespaceAndKeyword( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic", - "AbpAspNetCoreMvcUiLeptonXLiteThemeModule", - "AbpAspNetCoreMvcUiBasicThemeModule" - ); + var angularPackageName = context.BuildArgs.TemplateName is AppTemplate.TemplateName or AppNoLayersTemplate.TemplateName + ? "@abp/ng.theme.lepton-x" + : "@volosoft/abp.ng.theme.lepton-x"; - ChangeNamespaceAndKeyword( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs", - "Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling", - "Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling", - "LeptonXLiteThemeBundles.Styles.Global", - "BasicThemeBundles.Styles.Global" + ReplaceImportPackage( + context, + "/angular/src/app/app.module.ts", + angularPackageName, + "@abp/ng.theme.basic" ); - - ChangeNamespaceAndKeyword( + + RemoveLinesByStatement( context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling", - "BlazorLeptonXLiteThemeBundles.Styles.Global", - "BlazorBasicThemeBundles.Styles.Global" + "/angular/src/app/app.module.ts", + "SideMenuLayoutModule" ); - - - ChangeNamespaceAndKeyword( + + ReplaceMethodNames( context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Pages/_Host.cshtml", - "Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite", - "Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic", - "BlazorLeptonXLiteThemeBundles.Styles.Global", - "BlazorBasicThemeBundles.Styles.Global" + "/angular/src/app/app.module.ts", + "ThemeLeptonXModule", + "ThemeBasicModule" ); - ChangeNamespaceAndKeyword( + RemoveLinesByStatement( context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Pages/_Host.cshtml", - "Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling", - "Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling", - "BlazorLeptonXLiteThemeBundles.Scripts.Global", - "BlazorBasicThemeBundles.Scripts.Global" + "/angular/angular.json", + "node_modules/bootstrap-icons/font/bootstrap-icons.css" ); - + #endregion - - #region MyCompanyName.MyProjectName.AuthServer + } - ReplacePackageReferenceWithProjectReference( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite", - @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" - ); - - ChangeNamespaceAndKeyword( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic", - "AbpAspNetCoreMvcUiLeptonXLiteThemeModule", - "AbpAspNetCoreMvcUiBasicThemeModule" - ); + protected void ChangeToLeptonTheme(ProjectBuildContext context) + { + #region Common - ChangeNamespaceAndKeyword( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling", - "LeptonXLiteThemeBundles.Styles.Global", - "BasicThemeBundles.Styles.Global" - ); + RenameLeptonXFolders(context, folderName: "Lepton"); + AddLeptonThemeManagementReferenceToProjects(context); #endregion - - #region MyCompanyName.MyProjectName.Web.Mvc - - ReplacePackageReferenceWithProjectReference( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Web.Mvc/MyCompanyName.MyProjectName.Web.Mvc.csproj", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite", - @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" - ); - - ChangeNamespaceAndKeyword( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Web.Mvc/MyProjectNameWebModule.cs", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic", - "AbpAspNetCoreMvcUiLeptonXLiteThemeModule", - "AbpAspNetCoreMvcUiBasicThemeModule" - ); - ChangeNamespaceAndKeyword( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Web.Mvc/MyProjectNameWebModule.cs", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling", - "LeptonXLiteThemeBundles.Styles.Global", - "BasicThemeBundles.Styles.Global" - ); - - #endregion - - #region MyCompanyName.MyProjectName.Web.Mvc.Mongo + #region MVC Projects - ReplacePackageReferenceWithProjectReference( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Web.Mvc.Mongo/MyCompanyName.MyProjectName.Web.Mvc.Mongo.csproj", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite", - @"..\..\..\..\..\modules\basic-theme\\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" - ); - - ChangeNamespaceAndKeyword( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Web.Mvc.Mongo/MyProjectNameWebModule.cs", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic", - "AbpAspNetCoreMvcUiLeptonXLiteThemeModule", - "AbpAspNetCoreMvcUiBasicThemeModule" - ); + ChangeThemeToLeptonForMvcProjects(context); - ChangeNamespaceAndKeyword( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Web.Mvc.Mongo/MyProjectNameWebModule.cs", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling", - "LeptonXLiteThemeBundles.Styles.Global", - "BasicThemeBundles.Styles.Global" - ); - #endregion - #region MyCompanyName.MyProjectName.Blazor.Server - (app-nolayers) - - ChangeNamespaceAndKeyword( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs", - "Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme", - "Volo.Abp.AspNetCore.Components.Server.BasicTheme", - "AbpAspNetCoreComponentsServerLeptonXLiteThemeModule", - "AbpAspNetCoreComponentsServerBasicThemeModule" - ); - - ChangeNamespaceAndKeyword( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic", - "AbpAspNetCoreMvcUiLeptonXLiteThemeModule", - "AbpAspNetCoreMvcUiBasicThemeModule" - ); + #region MyCompanyName.MyProjectName.Blazor - ChangeNamespaceAndKeyword( + ReplacePackageReferenceWithProjectReference( context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs", - "Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling", - "Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling", - "LeptonXLiteThemeBundles.Styles.Global", - "BasicThemeBundles.Styles.Global" + "/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj", + "Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXTheme", + @"..\..\..\..\..\lepton-theme\src\Volo.Abp.AspNetCore.Components.WebAssembly.LeptonTheme\Volo.Abp.AspNetCore.Components.WebAssembly.LeptonTheme.csproj" ); ChangeNamespaceAndKeyword( context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling", - "BlazorLeptonXLiteThemeBundles.Styles.Global", - "BlazorBasicThemeBundles.Styles.Global" + "/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs", + "Volo.Abp.AspNetCore.Components.Web.LeptonXTheme.Components", + "Volo.Abp.AspNetCore.Components.Web.LeptonTheme.Components", + "AbpAspNetCoreComponentsWebAssemblyLeptonXThemeModule", + "AbpAspNetCoreComponentsWebAssemblyLeptonThemeModule" ); - + #endregion - - #region MyCompanyName.MyProjectName.Blazor.Server.Mongo - ReplacePackageReferenceWithProjectReference( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj", - "Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme", - @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" - ); - - ReplacePackageReferenceWithProjectReference( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite", - @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.Server.BasicTheme\Volo.Abp.AspNetCore.Components.Server.BasicTheme.csproj" - ); - - ChangeNamespaceAndKeyword( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs", - "Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme", - "Volo.Abp.AspNetCore.Components.Server.BasicTheme", - "AbpAspNetCoreComponentsServerLeptonXLiteThemeModule", - "AbpAspNetCoreComponentsServerBasicThemeModule" - ); - - ChangeNamespaceAndKeyword( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic", - "AbpAspNetCoreMvcUiLeptonXLiteThemeModule", - "AbpAspNetCoreMvcUiBasicThemeModule" - ); - - ChangeNamespaceAndKeyword( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs", - "Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling", - "Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling", - "LeptonXLiteThemeBundles.Styles.Global", - "BasicThemeBundles.Styles.Global" - ); - - ChangeNamespaceAndKeyword( - context, - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling", - "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling", - "BlazorLeptonXLiteThemeBundles.Styles.Global", - "BlazorBasicThemeBundles.Styles.Global" - ); - + #region MyCompanyName.MyProjectName.Blazor.Server && MyCompanyName.MyProjectName.Blazor.Server.Tiered + + ChangeThemeToLeptonForBlazorServerProjects(context); + #endregion #region Angular @@ -437,33 +154,208 @@ public class ChangeThemeStep : ProjectBuildPipelineStep ReplaceImportPackage( context, "/angular/src/app/app.module.ts", - "@abp/ng.theme.lepton-x", - "@abp/ng.theme.basic" + "@volosoft/abp.ng.theme.lepton-x", + "@volo/abp.ng.theme.lepton" ); RemoveLinesByStatement( context, "/angular/src/app/app.module.ts", - "SideMenuLayoutModule" + "SideMenuLayoutModule" ); ReplaceMethodNames( context, "/angular/src/app/app.module.ts", "ThemeLeptonXModule", - "ThemeBasicModule" + "ThemeLeptonModule" + ); + + RemoveLinesByStatement( + context, + "/angular/angular.json", + "node_modules/bootstrap-icons/font/bootstrap-icons.css" ); #endregion + + #region MyCompanyName.MyProjectName.Mvc && MyCompanyName.MyProjectName.Mvc.Mongo + + var projectNames = new[] {"Web", "HttpApi", "Application"}; + ConfigureLeptonManagementPackagesForNoLayersMvc(context, @"/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.csproj", projectNames); + + #endregion + + #region MyCompanyName.MyProjectName.Blazor.Server && MyCompanyName.MyProjectName.Blazor.Server.Mongo - (app-nolayers) + + ChangeThemeToLeptonForNoLayersBlazorServerProjects(context); + + #endregion + } + + private void ConfigureLeptonManagementPackagesForNoLayersMvc(ProjectBuildContext context, string targetProjectPath, string[] projectNames) + { + var file = context.Files.FirstOrDefault(f => !f.Name.Contains("Test") && f.Name.Contains(targetProjectPath) && f.Name.Contains(".csproj")); + if (file == null) + { + return; + } + + foreach (var projectName in projectNames) + { + var moduleFile = ConvertProjectFileToModuleFile(context, file); + if (moduleFile == null) + { + continue; + } + + AddProjectReference(file, $@"..\..\..\..\lepton-theme\src\Volo.Abp.LeptonTheme.Management.{projectName}\Volo.Abp.LeptonTheme.Management.{projectName}.csproj"); + AddModuleDependency(moduleFile, $"LeptonThemeManagement{ConvertProjectNameToModuleName($"{projectName}")}Module"); + } + } + + private void ChangeThemeToLeptonForMvcProjects(ProjectBuildContext context) + { + var projectNames = new[] + { + ".Web", ".HttpApi.Host", ".AuthServer", + "" //for app-nolayers-mvc + }; + + foreach (var projectName in projectNames) + { + var projectPath = $"/MyCompanyName.MyProjectName{projectName}/MyCompanyName.MyProjectName{projectName}.csproj"; + var projectFile = context.Files.FirstOrDefault(x => x.Name.Contains(projectPath)); + if (projectFile == null) + { + continue; + } + + var moduleFile = ConvertProjectFileToModuleFile(context, projectFile); + if (moduleFile == null) + { + continue; + } + + ReplacePackageReferenceWithProjectReference( + context, + projectFile.Name, + "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonX", + @"..\..\..\..\..\lepton-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Lepton\Volo.Abp.AspNetCore.Mvc.UI.Theme.Lepton.csproj" + ); + + ChangeNamespaceAndKeyword( + context, + moduleFile.Name, + "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonX.Bundling", + "Volo.Abp.AspNetCore.Mvc.UI.Theme.Lepton.Bundling", + "LeptonXThemeBundles.Styles.Global", + "LeptonThemeBundles.Styles.Global" + ); + + ChangeNamespaceAndKeyword( + context, + moduleFile.Name, + "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonX", + "Volo.Abp.AspNetCore.Mvc.UI.Theme.Lepton", + "AbpAspNetCoreMvcUiLeptonXThemeModule", + "AbpAspNetCoreMvcUiLeptonThemeModule" + ); + + RemoveLinesByStatement( + context, + moduleFile.Name, + "Volo.Abp.LeptonX.Shared;" + ); + } } + private void AddLeptonThemeManagementReferenceToProjects(ProjectBuildContext context) + { + var projects = new Dictionary + { + {"Domain", "MyCompanyName.MyProjectName.Domain.csproj"}, + {"Domain.Shared", "MyCompanyName.MyProjectName.Domain.Shared.csproj"}, + {"Application", "MyCompanyName.MyProjectName.Application.csproj"}, + {"Application.Contracts", "MyCompanyName.MyProjectName.Application.Contracts.csproj"}, + {"Blazor.WebAssembly", "MyCompanyName.MyProjectName.Blazor.csproj"}, + {"Blazor.Server", "MyCompanyName.MyProjectName.Blazor.Server.csproj"}, + {"HttpApi", "MyCompanyName.MyProjectName.HttpApi.csproj"}, + {"HttpApi.Client", "MyCompanyName.MyProjectName.HttpApi.Client.csproj"}, + {"Web.Host", "MyCompanyName.MyProjectName.Web.Host.csproj"}, + {"Web", "MyCompanyName.MyProjectName.Web.csproj"}, + }; + + foreach (var project in projects) + { + AddLeptonThemeManagementReference(context, project); + } + + var microserviceServiceProjects = new Dictionary + { + {"Domain", "MyCompanyName.MyProjectName.AdministrationService.Domain.csproj"}, + {"Domain.Shared", "MyCompanyName.MyProjectName.AdministrationService.Domain.Shared.csproj"}, + {"Application", "MyCompanyName.MyProjectName.AdministrationService.Application.csproj"}, + {"Application.Contracts", "MyCompanyName.MyProjectName.AdministrationService.Application.Contracts.csproj"}, + {"HttpApi", "MyCompanyName.MyProjectName.AdministrationService.HttpApi.csproj"}, + {"HttpApi.Client", "MyCompanyName.MyProjectName.AdministrationService.HttpApi.Client.csproj"}, + {"Web", "MyCompanyName.MyProjectName.AdministrationService.Web.csproj"} + }; + + foreach (var microserviceServiceProject in microserviceServiceProjects) + { + AddLeptonThemeManagementReference(context, microserviceServiceProject); + } + } + + private void AddLeptonThemeManagementReference(ProjectBuildContext context, KeyValuePair projectInfo) + { + var reference = $@"..\..\..\..\..\lepton-theme\src\Volo.Abp.LeptonTheme.Management.{projectInfo.Key}\Volo.Abp.LeptonTheme.Management.{projectInfo.Key}.csproj"; + var projectFile = context.Files.FirstOrDefault(f => !f.Name.Contains("Test") && f.Name.Contains(projectInfo.Value) && f.Name.Contains(".csproj")); + if (projectFile is null) + { + return; + } + + var moduleFile = ConvertProjectFileToModuleFile(context, projectFile); + if (moduleFile == null) + { + return; + } + + AddProjectReference(projectFile, reference); + + AddModuleDependency(moduleFile, $"LeptonThemeManagement{ConvertProjectNameToModuleName(projectInfo.Key)}Module", + underManagementFolder: projectInfo.Key != "HttpApi"); + } + + private void AddModuleDependency(FileEntry moduleFile, string dependency, bool underManagementFolder = true) + { + var lines = moduleFile.GetLines(); + + for (var i = 0; i < lines.Length; i++) + { + if (lines[i].Contains("namespace MyCompanyName.MyProjectName")) + { + lines[i - 1] = lines[i - 1] + "using Volo.Abp.LeptonTheme" + (underManagementFolder ? ".Management" : "").EnsureEndsWith(';') + Environment.NewLine; + } + + if (lines[i].Contains("public class MyProjectName") && lines[i-1].Contains(")]")) + { + lines[i - 2] = lines[i - 2] + "," + Environment.NewLine + $"\ttypeof({dependency})"; + } + } + + moduleFile.SetLines(lines); + } + protected void ReplacePackageReferenceWithProjectReference( ProjectBuildContext context, string targetProjectFilePath, string packageReference, string projectReference) { - var file = context.FindFile(targetProjectFilePath); + var file = context.Files.FirstOrDefault(x => x.Name.Contains(targetProjectFilePath)); if (file == null) { return; @@ -490,8 +382,7 @@ public class ChangeThemeStep : ProjectBuildPipelineStep string oldKeyword, string newKeyword) { - var file = context.FindFile(targetModuleFilePath); - + var file = context.Files.FirstOrDefault(x => x.Name.Contains(targetModuleFilePath)); if (file == null) { return; @@ -505,7 +396,7 @@ public class ChangeThemeStep : ProjectBuildPipelineStep { if (lines[i].Contains($"using {oldNamespace}")) { - lines[i] = $"using {newNamespace};"; + lines[i] = lines[i].Replace($"using {oldNamespace}", $"using {newNamespace}"); } else if (lines[i].Contains(oldKeyword)) { @@ -522,8 +413,7 @@ public class ChangeThemeStep : ProjectBuildPipelineStep string oldNamespace, string newNamespace) { - var file = context.FindFile(targetModuleFilePath); - + var file = context.Files.FirstOrDefault(x => x.Name.Contains(targetModuleFilePath)); if (file == null) { return; @@ -534,9 +424,9 @@ public class ChangeThemeStep : ProjectBuildPipelineStep var lines = file.GetLines(); for (var i = 0; i < lines.Length; i++) { - if (lines[i].Contains($"using {oldNamespace};")) + if (lines[i].Contains($"using {oldNamespace}")) { - lines[i] = $"using {newNamespace};"; + lines[i] = lines[i].Replace($"using {oldNamespace}", $"using {newNamespace}"); } } @@ -549,8 +439,7 @@ public class ChangeThemeStep : ProjectBuildPipelineStep string oldImportPackage, string newImportPackage) { - var file = context.FindFile(filePath); - + var file = context.Files.FirstOrDefault(x => x.Name.Contains(filePath)); if (file == null) { return; @@ -573,8 +462,7 @@ public class ChangeThemeStep : ProjectBuildPipelineStep string filePath, string statement) { - var file = context.FindFile(filePath); - + var file = context.Files.FirstOrDefault(x => x.Name.Contains(filePath)); if (file == null) { return; @@ -600,8 +488,7 @@ public class ChangeThemeStep : ProjectBuildPipelineStep string oldMethodName, string newMethodName) { - var file = context.FindFile(filePath); - + var file = context.Files.FirstOrDefault(x => x.Name.Contains(filePath)); if (file == null) { return; @@ -620,4 +507,376 @@ public class ChangeThemeStep : ProjectBuildPipelineStep file.SetLines(lines); } + + private static void AddProjectReference(FileEntry file, string reference) + { + if (!file.Name.Contains(".csproj")) + { + return; + } + + var doc = new XmlDocument() { PreserveWhitespace = true }; + using (var stream = StreamHelper.GenerateStreamFromString(file.Content)) + { + doc.Load(stream); + + var itemGroupNodes = doc.SelectNodes("/Project/ItemGroup"); + XmlNode itemGroupNode = null; + + if (itemGroupNodes == null || itemGroupNodes.Count < 1) + { + var projectNodes = doc.SelectNodes("/Project"); + var projectNode = projectNodes![0]; + + itemGroupNode = doc.CreateElement("ItemGroup"); + projectNode.AppendChild(itemGroupNode); + } + else + { + for (var i = 0; i < itemGroupNodes.Count; i++) + { + if (itemGroupNode is not null) + { + break; + } + for (var j = 0; j < itemGroupNodes[i].ChildNodes.Count; j++) + { + if (itemGroupNodes[i].ChildNodes[j].Name != "ProjectReference" || itemGroupNodes[i].ChildNodes[j].NodeType != XmlNodeType.Element) + { + continue; + } + + itemGroupNode = itemGroupNodes[i]; + break; + } + } + } + + itemGroupNode ??= itemGroupNodes[0]; + + var packageReferenceNode = doc.CreateElement("ProjectReference"); + + var includeAttr = doc.CreateAttribute("Include"); + includeAttr.Value = reference; + packageReferenceNode.Attributes.Append(includeAttr); + + itemGroupNode.AppendChild(doc.CreateTextNode("\t")); + itemGroupNode.AppendChild(packageReferenceNode); + itemGroupNode.AppendChild(doc.CreateTextNode(Environment.NewLine)); + file.SetContent(doc.OuterXml); + } + } + + private static FileEntry ConvertProjectFileToModuleFile(ProjectBuildContext context, FileEntry projectFile) + { + var splittedProjectFileName = projectFile.Name.RemovePostFix("/").Split("/"); + + splittedProjectFileName = splittedProjectFileName.Take(splittedProjectFileName.Length - 1).ToArray(); + + var fileName = splittedProjectFileName?.Last(); + if (fileName == null) + { + return null; + } + + fileName = fileName + .Replace("MyCompanyName.", "") + .Replace(".csproj", "Module") + .Replace(".", ""); + + fileName = ConvertProjectNameToModuleName(fileName); + + return context.Files.FirstOrDefault(f => f.Name.Contains(splittedProjectFileName.Last() + "/" + fileName)); + } + + private static string ConvertProjectNameToModuleName(string moduleName) + { + return moduleName.Replace(".", ""); + } + + private static void RenameLeptonXFolders(ProjectBuildContext context, string folderName) + { + var leptonXFiles = context.Files.Where(x => x.Name.Contains("LeptonX") && x.IsDirectory); + foreach (var file in leptonXFiles) + { + new MoveFolderStep(file.Name, file.Name.Replace("LeptonX", folderName)).Execute(context); + } + } + + private void ChangeThemeToBasicForMvcProjects(ProjectBuildContext context, string defaultThemeName) + { + var projects = new Dictionary + { + {".Web", "MyProjectNameWebModule"}, + {".HttpApi.Host", "MyProjectNameHttpApiHostModule"}, + {".AuthServer", "MyProjectNameAuthServerModule"}, + {"", "MyProjectNameWebModule"} + }; + + foreach (var project in projects) + { + ReplacePackageReferenceWithProjectReference( + context, + $"/MyCompanyName.MyProjectName{project.Key}/MyCompanyName.MyProjectName{project.Key}.csproj", + $"Volo.Abp.AspNetCore.Mvc.UI.Theme.{defaultThemeName}", + @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" + ); + + ChangeNamespaceAndKeyword( + context, + $"/MyCompanyName.MyProjectName{project.Key}/{project.Value}.cs", + $"Volo.Abp.AspNetCore.Mvc.UI.Theme.{defaultThemeName}", + "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic", + $"AbpAspNetCoreMvcUi{defaultThemeName}ThemeModule", + "AbpAspNetCoreMvcUiBasicThemeModule" + ); + + ChangeNamespaceAndKeyword( + context, + $"/MyCompanyName.MyProjectName{project.Key}/{project.Value}.cs", + $"Volo.Abp.AspNetCore.Mvc.UI.Theme.{defaultThemeName}.Bundling", + "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling", + $"{defaultThemeName}ThemeBundles.Styles.Global", + "BasicThemeBundles.Styles.Global" + ); + } + } + + private void ChangeThemeToBasicForBlazorServerProjects(ProjectBuildContext context, string defaultThemeName) + { + var projects = new Dictionary + { + {"Blazor", "MyProjectNameBlazorModule"}, + {"Blazor.Server.Tiered", "MyProjectNameBlazorModule"}, + {"Blazor.Server", "MyProjectNameModule"}, + {"Blazor.Server.Mongo", "MyProjectNameModule"} + }; + + foreach (var project in projects) + { + ReplacePackageReferenceWithProjectReference( + context, + $"/MyCompanyName.MyProjectName.{project.Key}/MyCompanyName.MyProjectName.{project.Key}.csproj", + $"Volo.Abp.AspNetCore.Components.Server.{defaultThemeName}Theme", + @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" + ); + + ReplacePackageReferenceWithProjectReference( + context, + $"/MyCompanyName.MyProjectName.{project.Key}/MyCompanyName.MyProjectName.{project.Key}.csproj", + $"Volo.Abp.AspNetCore.Mvc.UI.Theme.{defaultThemeName}", + @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.Server.BasicTheme\Volo.Abp.AspNetCore.Components.Server.BasicTheme.csproj" + ); + + ChangeNamespaceAndKeyword( + context, + $"/MyCompanyName.MyProjectName.{project.Key}/{project.Value}.cs", + $"Volo.Abp.AspNetCore.Components.Server.{defaultThemeName}Theme", + "Volo.Abp.AspNetCore.Components.Server.BasicTheme", + $"AbpAspNetCoreComponentsServer{defaultThemeName}ThemeModule", + "AbpAspNetCoreComponentsServerBasicThemeModule" + ); + + ChangeNamespaceAndKeyword( + context, + $"/MyCompanyName.MyProjectName.{project.Key}/{project.Value}.cs", + $"Volo.Abp.AspNetCore.Mvc.UI.Theme.{defaultThemeName}", + "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic", + $"AbpAspNetCoreMvcUi{defaultThemeName}ThemeModule", + "AbpAspNetCoreMvcUiBasicThemeModule" + ); + + ChangeNamespaceAndKeyword( + context, + $"/MyCompanyName.MyProjectName.{project.Key}/{project.Value}.cs", + $"Volo.Abp.AspNetCore.Components.Server.{defaultThemeName}Theme.Bundling", + "Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling", + $"{defaultThemeName}ThemeBundles.Styles.Global", + "BasicThemeBundles.Styles.Global" + ); + + ChangeNamespaceAndKeyword( + context, + $"/MyCompanyName.MyProjectName.{project.Key}/{project.Value}.cs", + $"Volo.Abp.AspNetCore.Mvc.UI.Theme.{defaultThemeName}.Bundling", + "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling", + $"Blazor{defaultThemeName}ThemeBundles.Styles.Global", + "BlazorBasicThemeBundles.Styles.Global" + ); + + ChangeNamespaceAndKeyword( + context, + $"/MyCompanyName.MyProjectName.{project.Key}/Pages/_Host.cshtml", + $"Volo.Abp.AspNetCore.Components.Web.{defaultThemeName}Theme.Themes.{defaultThemeName}", + "Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic", + $"Blazor{defaultThemeName}ThemeBundles.Styles.Global", + "BlazorBasicThemeBundles.Styles.Global" + ); + + ChangeNamespaceAndKeyword( + context, + $"/MyCompanyName.MyProjectName.{project.Key}/Pages/_Host.cshtml", + $"Volo.Abp.AspNetCore.Components.Server.{defaultThemeName}Theme.Bundling", + "Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling", + $"Blazor{defaultThemeName}ThemeBundles.Scripts.Global", + "BlazorBasicThemeBundles.Scripts.Global" + ); + } + } + + private void ChangeThemeToLeptonForBlazorServerProjects(ProjectBuildContext context) + { + var projectNames = new[] {"Blazor", "Blazor.Server.Tiered"}; + foreach (var projectName in projectNames) + { + ReplacePackageReferenceWithProjectReference( + context, + $"/MyCompanyName.MyProjectName.{projectName}/MyCompanyName.MyProjectName.{projectName}.csproj", + "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonX", + @"..\..\..\..\..\lepton-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Lepton\Volo.Abp.AspNetCore.Mvc.UI.Theme.Lepton.csproj" + ); + + ReplacePackageReferenceWithProjectReference( + context, + $"/MyCompanyName.MyProjectName.{projectName}/MyCompanyName.MyProjectName.{projectName}.csproj", + "Volo.Abp.AspNetCore.Components.Server.LeptonXTheme", + @"..\..\..\..\..\lepton-theme\src\Volo.Abp.AspNetCore.Components.Server.LeptonTheme\Volo.Abp.AspNetCore.Components.Server.LeptonTheme.csproj" + ); + + ChangeNamespaceAndKeyword( + context, + $"/MyCompanyName.MyProjectName.{projectName}/MyProjectNameBlazorModule.cs", + "Volo.Abp.AspNetCore.Components.Server.LeptonXTheme", + "Volo.Abp.AspNetCore.Components.Server.LeptonTheme", + "AbpAspNetCoreComponentsServerLeptonXThemeModule", + "AbpAspNetCoreComponentsServerLeptonThemeModule" + ); + + ChangeNamespaceAndKeyword( + context, + $"/MyCompanyName.MyProjectName.{projectName}/MyProjectNameBlazorModule.cs", + "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonX", + "Volo.Abp.AspNetCore.Mvc.UI.Theme.Lepton", + "AbpAspNetCoreMvcUiLeptonXThemeModule", + "AbpAspNetCoreMvcUiLeptonThemeModule" + ); + + ChangeNamespaceAndKeyword( + context, + $"/MyCompanyName.MyProjectName.{projectName}/MyProjectNameBlazorModule.cs", + "Volo.Abp.AspNetCore.Components.Server.LeptonXTheme.Bundling", + "Volo.Abp.AspNetCore.Components.Server.LeptonTheme.Bundling", + "LeptonXThemeBundles.Styles.Global", + "LeptonThemeBundles.Styles.Global" + ); + + ChangeNamespaceAndKeyword( + context, + $"/MyCompanyName.MyProjectName.{projectName}/MyProjectNameBlazorModule.cs", + "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonX.Bundling", + "Volo.Abp.AspNetCore.Mvc.UI.Theme.Lepton.Bundling", + "BlazorLeptonXThemeBundles.Styles.Global", + "BlazorLeptonThemeBundles.Styles.Global" + ); + + ChangeNamespaceAndKeyword( + context, + $"/MyCompanyName.MyProjectName.{projectName}/Pages/_Host.cshtml", + "Volo.Abp.AspNetCore.Components.Web.LeptonXTheme.Components", + "Volo.Abp.AspNetCore.Components.Web.LeptonTheme.Components", + "BlazorLeptonXThemeBundles.Styles.Global", + "BlazorLeptonThemeBundles.Styles.Global" + ); + + ChangeNamespaceAndKeyword( + context, + $"/MyCompanyName.MyProjectName.{projectName}/Pages/_Host.cshtml", + "Volo.Abp.AspNetCore.Components.Server.LeptonXTheme.Bundling", + "Volo.Abp.AspNetCore.Components.Server.LeptonTheme.Bundling", + "BlazorLeptonXThemeBundles.Scripts.Global", + "BlazorLeptonThemeBundles.Scripts.Global" + ); + } + } + + private void ChangeThemeToLeptonForNoLayersBlazorServerProjects(ProjectBuildContext context) + { + var blazorServerProjects = new[] { "Blazor.Server", "HttpApi", "Application" }; + + var projectNames = new[] { "Blazor.Server", "Blazor.Server.Mongo" }; + foreach (var projectName in projectNames) + { + ReplacePackageReferenceWithProjectReference( + context, + $"/MyCompanyName.MyProjectName.{projectName}/MyCompanyName.MyProjectName.{projectName}.csproj", + "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonX", + @"..\..\..\..\lepton-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Lepton\Volo.Abp.AspNetCore.Mvc.UI.Theme.Lepton.csproj" + ); + + ReplacePackageReferenceWithProjectReference( + context, + $"/MyCompanyName.MyProjectName.{projectName}/MyCompanyName.MyProjectName.{projectName}.csproj", + "Volo.Abp.AspNetCore.Components.Server.LeptonXTheme", + @"..\..\..\..\lepton-theme\src\Volo.Abp.AspNetCore.Components.Server.LeptonTheme\Volo.Abp.AspNetCore.Components.Server.LeptonTheme.csproj" + ); + + ConfigureLeptonManagementPackagesForNoLayersMvc(context, + $@"/MyCompanyName.MyProjectName.{projectName}/MyCompanyName.MyProjectName.{projectName}.csproj", + blazorServerProjects); + + ChangeNamespaceAndKeyword( + context, + $"/MyCompanyName.MyProjectName.{projectName}/MyProjectNameModule.cs", + "Volo.Abp.AspNetCore.Components.Server.LeptonXTheme", + "Volo.Abp.AspNetCore.Components.Server.LeptonTheme", + "AbpAspNetCoreComponentsServerLeptonXThemeModule", + "AbpAspNetCoreComponentsServerLeptonThemeModule" + ); + + ChangeNamespaceAndKeyword( + context, + $"/MyCompanyName.MyProjectName.{projectName}/MyProjectNameModule.cs", + "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonX", + "Volo.Abp.AspNetCore.Mvc.UI.Theme.Lepton", + "AbpAspNetCoreMvcUiLeptonXThemeModule", + "AbpAspNetCoreMvcUiLeptonThemeModule" + ); + + ChangeNamespaceAndKeyword( + context, + $"/MyCompanyName.MyProjectName.{projectName}/MyProjectNameModule.cs", + "Volo.Abp.AspNetCore.Components.Server.LeptonXTheme.Bundling", + "Volo.Abp.AspNetCore.Components.Server.LeptonTheme.Bundling", + "LeptonXThemeBundles.Styles.Global", + "LeptonThemeBundles.Styles.Global" + ); + + ChangeNamespaceAndKeyword( + context, + $"/MyCompanyName.MyProjectName.{projectName}/MyProjectNameModule.cs", + "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonX.Bundling", + "Volo.Abp.AspNetCore.Mvc.UI.Theme.Lepton.Bundling", + "BlazorLeptonXThemeBundles.Styles.Global", + "BlazorLeptonThemeBundles.Styles.Global" + ); + + ChangeNamespaceAndKeyword( + context, + $"/MyCompanyName.MyProjectName.{projectName}/Pages/_Host.cshtml", + "Volo.Abp.AspNetCore.Components.Web.LeptonXTheme.Components", + "Volo.Abp.AspNetCore.Components.Web.LeptonTheme.Components", + "BlazorLeptonXThemeBundles.Styles.Global", + "BlazorLeptonThemeBundles.Styles.Global" + ); + + ChangeNamespaceAndKeyword( + context, + $"/MyCompanyName.MyProjectName.{projectName}/Pages/_Host.cshtml", + "Volo.Abp.AspNetCore.Components.Server.LeptonXTheme.Bundling", + "Volo.Abp.AspNetCore.Components.Server.LeptonTheme.Bundling", + "BlazorLeptonXThemeBundles.Scripts.Global", + "BlazorLeptonThemeBundles.Scripts.Global" + ); + } + } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStyleStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStyleStep.cs new file mode 100644 index 0000000000..ef6a1e9474 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStyleStep.cs @@ -0,0 +1,76 @@ +using System.Collections.Generic; +using System.Linq; + +namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps; + +public class ChangeThemeStyleStep : ProjectBuildPipelineStep +{ + public override void Execute(ProjectBuildContext context) + { + if (context.BuildArgs.Theme != Theme.LeptonX) + { + return; + } + + switch (context.BuildArgs.ThemeStyle) + { + case ThemeStyle.Light: + ChangeThemeStyle(context, themeStyleName: "Light"); + break; + case ThemeStyle.Dark: + ChangeThemeStyle(context, themeStyleName: "Dark"); + break; + } + } + + private void ChangeThemeStyle(ProjectBuildContext context, string themeStyleName) + { + var defaultThemeStyleName = "LeptonXStyleNames.Dim"; + var newThemeStyleName = $"LeptonXStyleNames.{themeStyleName}"; + + var filePaths = new List + { + "/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs", + "/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs", + "/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs", + "/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs", + "/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs", + "/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs", + "/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs", + "/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs", + "/MyCompanyName.MyProjectName.Host/MyProjectNameModule.cs", + "/MyCompanyName.MyProjectName.Host.Mongo/MyProjectNameModule.cs", + "/MyCompanyName.MyProjectName.Mvc/MyProjectNameModule.cs", + "/MyCompanyName.MyProjectName.Mvc.Mongo/MyProjectNameModule.cs", + "/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs", + "/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs", + }; + + foreach(var filePath in filePaths) + { + ChangeThemeStyleName(context, filePath, defaultThemeStyleName, newThemeStyleName); + } + } + + protected void ChangeThemeStyleName(ProjectBuildContext context, string filePath, string oldThemeStyleName, string newThemeStyleName) + { + var file = context.Files.FirstOrDefault(x => x.Name.Contains(filePath)); + if (file == null) + { + return; + } + + file.NormalizeLineEndings(); + + var lines = file.GetLines(); + for (var i = 0; i < lines.Length; i++) + { + if (lines[i].Contains(oldThemeStyleName)) + { + lines[i] = lines[i].Replace(oldThemeStyleName, newThemeStyleName); + } + } + + file.SetLines(lines); + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveDependencyFromPackageJsonFileStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveDependencyFromPackageJsonFileStep.cs index 00f7629f52..3eabb6621e 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveDependencyFromPackageJsonFileStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveDependencyFromPackageJsonFileStep.cs @@ -17,7 +17,7 @@ public class RemoveDependencyFromPackageJsonFileStep : ProjectBuildPipelineStep public override void Execute(ProjectBuildContext context) { - var packageJsonFile = context.Files.FirstOrDefault(f => f.Name == _packageJsonFilePath); + var packageJsonFile = context.Files.FirstOrDefault(f => f.Name.Contains(_packageJsonFilePath)); if (packageJsonFile == null) { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Theme.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Theme.cs index bc2ba89589..1ef1c0da55 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Theme.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Theme.cs @@ -1,7 +1,10 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building; -public enum Theme +public enum Theme : byte { - LeptonXLite = 0, - Basic = 1 + NotSpecified = 0, + Basic = 1, + Lepton = 2, + LeptonXLite = 3, + LeptonX = 4 } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ThemeStyle.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ThemeStyle.cs new file mode 100644 index 0000000000..e9a8804f70 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ThemeStyle.cs @@ -0,0 +1,8 @@ +namespace Volo.Abp.Cli.ProjectBuilding.Building; +public enum ThemeStyle : byte +{ + NotSpecified = 0, + Dim = 1, + Light = 2, + Dark = 3 +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ProjectBuildArgs.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ProjectBuildArgs.cs index 18edb71863..b4b4429767 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ProjectBuildArgs.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ProjectBuildArgs.cs @@ -44,6 +44,8 @@ public class ProjectBuildArgs public Theme? Theme { get; set; } + public ThemeStyle? ThemeStyle { get; set; } + [NotNull] public Dictionary ExtraProperties { get; set; } @@ -63,7 +65,8 @@ public class ProjectBuildArgs Dictionary extraProperties = null, [CanBeNull] string connectionString = null, bool pwa = false, - Theme? theme = null) + Theme? theme = null, + ThemeStyle? themeStyle = null) { SolutionName = Check.NotNull(solutionName, nameof(solutionName)); TemplateName = templateName; @@ -81,5 +84,6 @@ public class ProjectBuildArgs ConnectionString = connectionString; Pwa = pwa; Theme = theme; + ThemeStyle = themeStyle; } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersProTemplate.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersProTemplate.cs index 7e7be0143f..73f00882bf 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersProTemplate.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersProTemplate.cs @@ -1,4 +1,6 @@ -namespace Volo.Abp.Cli.ProjectBuilding.Templates.App; +using Volo.Abp.Cli.ProjectBuilding.Building; + +namespace Volo.Abp.Cli.ProjectBuilding.Templates.App; public class AppNoLayersProTemplate : AppNoLayersTemplateBase { @@ -6,6 +8,8 @@ public class AppNoLayersProTemplate : AppNoLayersTemplateBase /// "app-nolayers-pro". /// public const string TemplateName = "app-nolayers-pro"; + + public const Theme DefaultTheme = Theme.LeptonX; public AppNoLayersProTemplate() : base(TemplateName) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplate.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplate.cs index 24119c43f2..d8bcdfe3f3 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplate.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplate.cs @@ -1,4 +1,6 @@ -namespace Volo.Abp.Cli.ProjectBuilding.Templates.App; +using Volo.Abp.Cli.ProjectBuilding.Building; + +namespace Volo.Abp.Cli.ProjectBuilding.Templates.App; public class AppNoLayersTemplate : AppNoLayersTemplateBase { @@ -7,6 +9,8 @@ public class AppNoLayersTemplate : AppNoLayersTemplateBase /// public const string TemplateName = "app-nolayers"; + public const Theme DefaultTheme = Theme.LeptonXLite; + public AppNoLayersTemplate() : base(TemplateName) { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppProTemplate.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppProTemplate.cs index 25a4797f7d..d9f32ee834 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppProTemplate.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppProTemplate.cs @@ -1,4 +1,6 @@ -namespace Volo.Abp.Cli.ProjectBuilding.Templates.App; +using Volo.Abp.Cli.ProjectBuilding.Building; + +namespace Volo.Abp.Cli.ProjectBuilding.Templates.App; public class AppProTemplate : AppTemplateBase { @@ -6,6 +8,8 @@ public class AppProTemplate : AppTemplateBase /// "app-pro". /// public const string TemplateName = "app-pro"; + + public const Theme DefaultTheme = Theme.LeptonX; public AppProTemplate() : base(TemplateName) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplate.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplate.cs index 8c533b1d94..ae9516f597 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplate.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplate.cs @@ -1,4 +1,6 @@ -namespace Volo.Abp.Cli.ProjectBuilding.Templates.App; +using Volo.Abp.Cli.ProjectBuilding.Building; + +namespace Volo.Abp.Cli.ProjectBuilding.Templates.App; public class AppTemplate : AppTemplateBase { @@ -6,6 +8,8 @@ public class AppTemplate : AppTemplateBase /// "app". /// public const string TemplateName = "app"; + + public const Theme DefaultTheme = Theme.LeptonXLite; public AppTemplate() : base(TemplateName) 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 2503378828..fb1fc79399 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 @@ -1,9 +1,11 @@ using System; using System.Collections.Generic; +using System.Linq; using NuGet.Versioning; using Volo.Abp.Cli.Commands; using Volo.Abp.Cli.ProjectBuilding.Building; using Volo.Abp.Cli.ProjectBuilding.Building.Steps; +using Volo.Abp.Cli.ProjectBuilding.Templates.Microservice; namespace Volo.Abp.Cli.ProjectBuilding.Templates.App; @@ -183,55 +185,76 @@ public abstract class AppTemplateBase : TemplateInfo { return; } - - if (context.BuildArgs.Theme != Theme.LeptonXLite) + + if (context.BuildArgs.Theme == Theme.LeptonX) + { + context.Symbols.Add("LEPTONX"); + steps.Add(new ChangeThemeStyleStep()); + } + + if (IsDefaultThemeForTemplate(context.BuildArgs.Theme.Value)) { - steps.Add(new ChangeThemeStep()); - RemoveLeptonXThemePackagesFromPackageJsonFiles(steps); + return; } + + steps.Add(new ChangeThemeStep()); + RemoveLeptonXThemePackagesFromPackageJsonFiles(steps, isProTemplate: IsPro()); } - private void RemoveLeptonXThemePackagesFromPackageJsonFiles(List steps) + private static bool IsDefaultThemeForTemplate(Theme theme) + { + var defaultThemesForTemplates = new[] + { + AppTemplate.DefaultTheme, AppProTemplate.DefaultTheme, + AppNoLayersTemplate.DefaultTheme, AppNoLayersProTemplate.DefaultTheme + }; + + return defaultThemesForTemplates.Any(defaultTheme => defaultTheme == theme); + } + + private static void RemoveLeptonXThemePackagesFromPackageJsonFiles(List steps, bool isProTemplate) { - var packageJsonFilePaths = new List() - { - "/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json", - "/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json", - "/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json", - "/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json", - "/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json", - "/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json", - "/aspnet-core/MyCompanyName.MyProjectName.Host/package.json", - "/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json", + var packageJsonFilePaths = new List + { + "/MyCompanyName.MyProjectName.Web/package.json", + "/MyCompanyName.MyProjectName.Web.Host/package.json", + "/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json", + "/MyCompanyName.MyProjectName.AuthServer/package.json", + "/MyCompanyName.MyProjectName/package.json", + "/MyCompanyName.MyProjectName.Host/package.json", + "/MyCompanyName.MyProjectName.Host.Mongo/package.json" }; - var blazorServerPackageJsonFilePaths = new List() + var blazorServerPackageJsonFilePaths = new List { - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json", - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json", - "/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json", - "/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json" + "/MyCompanyName.MyProjectName.Blazor.Server/package.json", + "/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json", + "/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json" }; - var angularPackageJsonFilePaths = new List() + var angularPackageJsonFilePaths = new List { "/angular/package.json" }; + var mvcUiPackageName = isProTemplate ? "@volo/abp.aspnetcore.mvc.ui.theme.leptonx" : "@abp/aspnetcore.mvc.ui.theme.leptonxlite"; + var blazorServerUiPackageName = isProTemplate ? "@volo/aspnetcore.components.server.leptonxtheme" : "@abp/aspnetcore.components.server.leptonxlitetheme"; + var ngUiPackageName = isProTemplate ? "@volosoft/abp.ng.theme.lepton-x" : "@abp/ng.theme.lepton-x"; + foreach (var packageJsonFilePath in packageJsonFilePaths) { - steps.Add(new RemoveDependencyFromPackageJsonFileStep(packageJsonFilePath, "@abp/aspnetcore.mvc.ui.theme.leptonxlite")); + steps.Add(new RemoveDependencyFromPackageJsonFileStep(packageJsonFilePath, mvcUiPackageName)); } foreach (var blazorServerPackageJsonFilePath in blazorServerPackageJsonFilePaths) { - steps.Add(new RemoveDependencyFromPackageJsonFileStep(blazorServerPackageJsonFilePath, "@abp/aspnetcore.mvc.ui.theme.leptonxlite")); - steps.Add(new RemoveDependencyFromPackageJsonFileStep(blazorServerPackageJsonFilePath, "@abp/aspnetcore.components.server.leptonxlitetheme")); + steps.Add(new RemoveDependencyFromPackageJsonFileStep(blazorServerPackageJsonFilePath, mvcUiPackageName)); + steps.Add(new RemoveDependencyFromPackageJsonFileStep(blazorServerPackageJsonFilePath, blazorServerUiPackageName)); } foreach (var angularPackageJsonFilePath in angularPackageJsonFilePaths) { - steps.Add(new RemoveDependencyFromPackageJsonFileStep(angularPackageJsonFilePath, "@abp/ng.theme.lepton-x")); + steps.Add(new RemoveDependencyFromPackageJsonFileStep(angularPackageJsonFilePath, ngUiPackageName)); steps.Add(new RemoveDependencyFromPackageJsonFileStep(angularPackageJsonFilePath, "bootstrap-icons")); } } @@ -548,27 +571,41 @@ public abstract class AppTemplateBase : TemplateInfo { case UiFramework.None: steps.Add(new RemoveFileStep("/aspnet-core/etc/docker/docker-compose.Blazor.yml")); + steps.Add(new RemoveFileStep("/aspnet-core/etc/docker/docker-compose.Blazor.Server.yml")); steps.Add(new RemoveFileStep("/aspnet-core/etc/docker/docker-compose.Mvc.yml")); steps.Add(new RemoveFileStep("/aspnet-core/etc/docker/dynamic-env.json")); + steps.Add(new RemoveFileStep("/aspnet-core/etc/docker/appsettings.json")); steps.Add(new MoveFileStep("/aspnet-core/etc/docker/docker-compose.Angular.yml", "/aspnet-core/etc/docker/docker-compose.yml")); break; case UiFramework.Angular: steps.Add(new RemoveFileStep("/aspnet-core/etc/docker/docker-compose.Blazor.yml")); + steps.Add(new RemoveFileStep("/aspnet-core/etc/docker/docker-compose.Blazor.Server.yml")); steps.Add(new RemoveFileStep("/aspnet-core/etc/docker/docker-compose.Mvc.yml")); + steps.Add(new RemoveFileStep("/aspnet-core/etc/docker/appsettings.json")); steps.Add(new MoveFileStep("/aspnet-core/etc/docker/docker-compose.Angular.yml", "/aspnet-core/etc/docker/docker-compose.yml")); break; case UiFramework.Blazor: - case UiFramework.BlazorServer: steps.Add(new RemoveFileStep("/aspnet-core/etc/docker/docker-compose.Angular.yml")); + steps.Add(new RemoveFileStep("/aspnet-core/etc/docker/docker-compose.Blazor.Server.yml")); steps.Add(new RemoveFileStep("/aspnet-core/etc/docker/docker-compose.Mvc.yml")); steps.Add(new RemoveFileStep("/aspnet-core/etc/docker/dynamic-env.json")); steps.Add(new MoveFileStep("/aspnet-core/etc/docker/docker-compose.Blazor.yml", "/aspnet-core/etc/docker/docker-compose.yml")); break; + case UiFramework.BlazorServer: + steps.Add(new RemoveFileStep("/aspnet-core/etc/docker/docker-compose.Angular.yml")); + steps.Add(new RemoveFileStep("/aspnet-core/etc/docker/docker-compose.Mvc.yml")); + steps.Add(new RemoveFileStep("/aspnet-core/etc/docker/docker-compose.Blazor.yml")); + steps.Add(new RemoveFileStep("/aspnet-core/etc/docker/dynamic-env.json")); + steps.Add(new RemoveFileStep("/aspnet-core/etc/docker/appsettings.json")); + steps.Add(new MoveFileStep("/aspnet-core/etc/docker/docker-compose.Blazor.Server.yml", "/aspnet-core/etc/docker/docker-compose.yml")); + break; case UiFramework.NotSpecified: case UiFramework.Mvc: steps.Add(new RemoveFileStep("/aspnet-core/etc/docker/docker-compose.Blazor.yml")); + steps.Add(new RemoveFileStep("/aspnet-core/etc/docker/docker-compose.Blazor.Server.yml")); steps.Add(new RemoveFileStep("/aspnet-core/etc/docker/docker-compose.Angular.yml")); steps.Add(new RemoveFileStep("/aspnet-core/etc/docker/dynamic-env.json")); + steps.Add(new RemoveFileStep("/aspnet-core/etc/docker/appsettings.json")); steps.Add(new MoveFileStep("/aspnet-core/etc/docker/docker-compose.Mvc.yml", "/aspnet-core/etc/docker/docker-compose.yml")); break; } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceProTemplate.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceProTemplate.cs index 6741a142dd..43b0884835 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceProTemplate.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceProTemplate.cs @@ -1,4 +1,6 @@ -namespace Volo.Abp.Cli.ProjectBuilding.Templates.Microservice; +using Volo.Abp.Cli.ProjectBuilding.Building; + +namespace Volo.Abp.Cli.ProjectBuilding.Templates.Microservice; public class MicroserviceProTemplate : MicroserviceTemplateBase { @@ -7,6 +9,8 @@ public class MicroserviceProTemplate : MicroserviceTemplateBase /// public const string TemplateName = "microservice-pro"; + public const Theme DefaultTheme = Theme.LeptonX; + public MicroserviceProTemplate() : base(TemplateName) { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs index 309afae446..71f090a576 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs @@ -24,9 +24,68 @@ public abstract class MicroserviceTemplateBase : TemplateInfo DeleteUnrelatedProjects(context, steps); RandomizeStringEncryption(context, steps); UpdateNuGetConfig(context, steps); + ConfigureTheme(context, steps); return steps; } + + protected void ConfigureTheme(ProjectBuildContext context, List steps) + { + if (!context.BuildArgs.Theme.HasValue) + { + return; + } + + if (context.BuildArgs.Theme == Theme.LeptonX) + { + context.Symbols.Add("LEPTONX"); + steps.Add(new ChangeThemeStyleStep()); + return; + } + + steps.Add(new ChangeThemeStep()); + RemoveLeptonXThemePackagesFromPackageJsonFiles(steps); + } + + private static void RemoveLeptonXThemePackagesFromPackageJsonFiles(List steps) + { + var packageJsonFilePaths = new List + { + "/MyCompanyName.MyProjectName.AuthServer/package.json", + "/MyCompanyName.MyProjectName.Web/package.json" + }; + + var blazorServerPackageJsonFilePaths = new List + { + "/MyCompanyName.MyProjectName.Blazor.Server/package.json" + }; + + var angularPackageJsonFilePaths = new List + { + "/angular/package.json" + }; + + var mvcUiPackageName = "@volo/abp.aspnetcore.mvc.ui.theme.leptonx"; + var blazorServerUiPackageName = "@volo/aspnetcore.components.server.leptonxtheme"; + var ngUiPackageName = "@volosoft/abp.ng.theme.lepton-x"; + + foreach (var packageJsonFilePath in packageJsonFilePaths) + { + steps.Add(new RemoveDependencyFromPackageJsonFileStep(packageJsonFilePath, mvcUiPackageName)); + } + + foreach (var blazorServerPackageJsonFilePath in blazorServerPackageJsonFilePaths) + { + steps.Add(new RemoveDependencyFromPackageJsonFileStep(blazorServerPackageJsonFilePath, mvcUiPackageName)); + steps.Add(new RemoveDependencyFromPackageJsonFileStep(blazorServerPackageJsonFilePath, blazorServerUiPackageName)); + } + + foreach (var angularPackageJsonFilePath in angularPackageJsonFilePaths) + { + steps.Add(new RemoveDependencyFromPackageJsonFileStep(angularPackageJsonFilePath, ngUiPackageName)); + steps.Add(new RemoveDependencyFromPackageJsonFileStep(angularPackageJsonFilePath, "bootstrap-icons")); + } + } private static void DeleteUnrelatedProjects(ProjectBuildContext context, List steps) { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/ExceptionMessageHelper.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/ExceptionMessageHelper.cs new file mode 100644 index 0000000000..dd78be14db --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/ExceptionMessageHelper.cs @@ -0,0 +1,6 @@ +namespace Volo.Abp.Cli.Utils; + +public static class ExceptionMessageHelper +{ + public static string GetInvalidOptionExceptionMessage(string optionName) => $"The option you provided for {optionName} is invalid!"; +} \ No newline at end of file diff --git a/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_Tests.cs b/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_Tests.cs index fdba79f1af..7908dd3d96 100644 --- a/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_Tests.cs +++ b/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_Tests.cs @@ -947,4 +947,19 @@ public class DistributedCache_Tests : AbpIntegratedTest cacheValue[0].Value.ShouldBeNull(); cacheValue[1].Value.ShouldBeNull(); } + + [Fact] + public async Task Should_Get_Same_Cache_Set_When_Resolve_With_Or_Without_Key() + { + var cache1 = GetRequiredService>(); + var cache2 = GetRequiredService>(); + + await cache1.SetAsync("john", new PersonCacheItem("John Doe")); + + var item1 = await cache1.GetAsync("john"); + item1.Name.ShouldBe("John Doe"); + + var item2 = await cache2.GetAsync("john"); + item2.Name.ShouldBe("John Doe"); + } } 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 a2a3bf48fd..0782bbfb73 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": "^5.3.2", + "@abp/aspnetcore.mvc.ui.theme.shared": "^5.3.3", "highlight.js": "^9.13.1" }, "devDependencies": {} diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock index bb5a7948db..22aacbd31b 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock @@ -2,30 +2,30 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.shared@^5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.2.tgz#7ffe5199d7df25b043919592edfbd15c5033acd6" - integrity sha512-8C6QTUqKfi2wCGo+uSZi4tEtPog/E/+F+jBDfT8tFj3eZ8UFZXwYFGUKKt/m1KsVCJ0ItHj1FxKSlpvgadcmtg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.2" - "@abp/bootstrap" "~5.3.2" - "@abp/bootstrap-datepicker" "~5.3.2" - "@abp/datatables.net-bs5" "~5.3.2" - "@abp/font-awesome" "~5.3.2" - "@abp/jquery-form" "~5.3.2" - "@abp/jquery-validation-unobtrusive" "~5.3.2" - "@abp/lodash" "~5.3.2" - "@abp/luxon" "~5.3.2" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.2" - "@abp/select2" "~5.3.2" - "@abp/sweetalert2" "~5.3.2" - "@abp/timeago" "~5.3.2" - "@abp/toastr" "~5.3.2" - -"@abp/aspnetcore.mvc.ui@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.2.tgz#59c8ba140898260c0e1f0612f135af17bd5ae146" - integrity sha512-o12lXWhckLsvYn7xmlOgsUot0WVc/Mljfrf/HIpyzntW1jL0aqGgnG4bNVDlF77fXiPlwK/7WpwHKugqXMPOPQ== +"@abp/aspnetcore.mvc.ui.theme.shared@^5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.3.tgz#65f97d787647e7760bb0c2a5b0f0ff815dc9630a" + integrity sha512-p/Z++QPM7S2lm7obXsZXIarcw0Y88y/Ghy5hyZqdc3uNHL6j8LRlD2qfuRXzl0k9HytXa859UKtSMLSZij1DiA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~5.3.3" + "@abp/bootstrap" "~5.3.3" + "@abp/bootstrap-datepicker" "~5.3.3" + "@abp/datatables.net-bs5" "~5.3.3" + "@abp/font-awesome" "~5.3.3" + "@abp/jquery-form" "~5.3.3" + "@abp/jquery-validation-unobtrusive" "~5.3.3" + "@abp/lodash" "~5.3.3" + "@abp/luxon" "~5.3.3" + "@abp/malihu-custom-scrollbar-plugin" "~5.3.3" + "@abp/select2" "~5.3.3" + "@abp/sweetalert2" "~5.3.3" + "@abp/timeago" "~5.3.3" + "@abp/toastr" "~5.3.3" + +"@abp/aspnetcore.mvc.ui@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.3.tgz#b8beb98bde3e4f0340335014ced7653c7913a621" + integrity sha512-aDQxdfQmlEXIjWGW8wru58imh9cncHAijafvdXlmyfKHM2JfnSSCG/RPMiaoJq/iyDVEggbhx8z4VHODC1eitg== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -34,144 +34,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.2.tgz#065b6d5b4dc484ed4c34c01209d319027e8967ea" - integrity sha512-uA2g1sThLIvGwirbLWLxExw46jnC63jjjs8aO5qSOrGrGfT6XB1OLgnnOPdFacZqPjYneGZ7ULXvOzGh2SsBYQ== +"@abp/bootstrap-datepicker@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.3.tgz#66bf2be128e6389877ed4465149c1933ca182c71" + integrity sha512-w/gPj4BVzVnmwekWVHKPYkwnhZFFH1XtCtw5LeJVM5bSYQBrvVTvvUPdKiiTDV59OYf2sbsA+PscwcTWAG6t/Q== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.2.tgz#7b2663b1d5b0ba8cd079dfb020e26b01fced3118" - integrity sha512-tdbzywiDnbsjNdOY0QBGYD/AtgchGSY7JQZoYczN9Rk4IZr7Axy1Dkw3sP/UBOQrxIOdUGlTEg2bi0MzAmTTig== +"@abp/bootstrap@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.3.tgz#56335b46bd42fba0a522712fbb6591fb6aeb5b68" + integrity sha512-xOtC690pE+QxZYhhQrpTE1rapEjg9BrJg7e0qvrkt4TLMZ4mIbau6/Qlh6x8uuMASCUUuRTLNUzHijxvOJh7Mg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" bootstrap "^5.1.3" -"@abp/core@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.2.tgz#f16026cdfd993c78904a5afe6642b5da8fbc6707" - integrity sha512-kCS8XtL2UyqYavWYGN8SY2A9PKdY5fJxKBEB6GMin4v6LzJB8f7auomLY+gFJs0PjG2rYcyT7sgVijNlOs4ypg== +"@abp/core@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.3.tgz#b03fc281d650d483c9276591f2adb26ea43dcd1e" + integrity sha512-Pp8U+LjchtSxc9lTRaPNQhb+Eh7X2LVERmZvoWyET0y/st28PJZ4eZ4iyGmV00pEmCpadF5aTWVhJcGH32scdQ== dependencies: - "@abp/utils" "~5.3.2" + "@abp/utils" "~5.3.3" -"@abp/datatables.net-bs5@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.2.tgz#bcccfe383ea271f845d25134307c2b407a513c33" - integrity sha512-MTaJW8LKvxOqzWFqmSZP3RcI3ygzB9sC8gH6J3ayILIXuMR+MjWe2OEMYAAQaT/582pME1wHtbp/dthkz6cmRQ== +"@abp/datatables.net-bs5@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.3.tgz#e00304fbe7e6d9d33e1082485f7aa07de48fac0c" + integrity sha512-dkbP3PPkMRJqxravYO7NIVww+MQC3FxHP7mPCg/+PG/LttaNJ5L5hoNcb7BMK2K76hBRMdvlSIzvjycb1w1ooA== dependencies: - "@abp/datatables.net" "~5.3.2" + "@abp/datatables.net" "~5.3.3" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.2.tgz#870959555907cad03dbcb8b3866f2be4aea7a16e" - integrity sha512-7F3dCqBmBzm8h6cM1tl8JG1eras7GaSbDKqJY3CqVCnDgJsk1O966p0VrZjWBxWKJrCoQCDX7+vid9UJlo/1aw== +"@abp/datatables.net@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.3.tgz#6d8eca1034e26708b9adf0d5917aefd5772cbf30" + integrity sha512-1JuXMzHDtrvGRNBYdwEVobiYmhd7VxM432ciARX8hzvSkE0jcgzeTrSlBXfenFMPOIAUJsSOE4YVshtqrY0G4g== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.2.tgz#2ae82288e1c4d664b673d2d7ec264f05fac98d7a" - integrity sha512-ZXNbI+U++Kz73FAEtWCc6KMZYQehqOQCSPEC4AfpYptK6fQ4weTARWzdfWcXluNSPeBtdl3Of+IR4TRjjUEyPA== +"@abp/font-awesome@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.3.tgz#b10a530c9dee28838536746ea2a40342ff2ee3a8" + integrity sha512-c+cvsQ1uolSoyTkM9rZYYM07iiq/Zu8zKOQaDbitQMfPkcfSnC3PG/PTNauSYuwh/SyFfacFXeaDQ5Y/kAGRLw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.2.tgz#0dc63c9b546a4aef4967fad90e6cd010aae976fa" - integrity sha512-S6lWlz32RgZj+ETrg214kOm5++HNiW4ftNRP4DMbwkq3dHvRvHqywdmVLfwaRciAsYpGqu0fl6T4P2WHiPRw2w== +"@abp/jquery-form@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.3.tgz#94234207aa991e098e49e7d1244dc86d289a48e6" + integrity sha512-TY5c4ODfSidYGWqUR+QMNbxasfSufSg9gLY8lTEaJn2Wd2+o3GlauPxlTeNIRCRsxqb8e5+fBJspq1YbtE8vQg== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.2.tgz#91a393a24ab60fce366c65ba23bddf36411da7cb" - integrity sha512-8V99Oaff6P7dQ46klCcl/CmC1OY6MJ43SyUnOltRCVeIodga8wK8rgvJFM5tYZQVmIdNtdxrUziNMw611N+3Uw== +"@abp/jquery-validation-unobtrusive@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.3.tgz#03f776807b60f32d2470c3d3c975ee20f33a993d" + integrity sha512-BNa2oSOfc5CSLW62SLCOinP7ybDDSVjfn0LYdDOdkIpSPnoL/3E1ZmgEzkDCUdTfJ67320kGDtIHCpb+Wbik+Q== dependencies: - "@abp/jquery-validation" "~5.3.2" + "@abp/jquery-validation" "~5.3.3" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.2.tgz#18a0f7ca797adebe9393732a62251760f34f66f0" - integrity sha512-uokx6CKtHlu8WCe3YogPi+24KG15hOi7vvtiwvwZ2dV9rJpbAnDYnq7NLwjh1JFlRGsPp8vpLi9m9zilKf1CDg== +"@abp/jquery-validation@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.3.tgz#a0544428b94966f35d3aebb40c354d3f4485137d" + integrity sha512-GFhrS4pVmbQRI0eiW2aBYmRTB0rR2s3Wj4NIVB69ZHwvy+uADA3M/oMs8Q4wuT+gmPu2GCjPNCc5RPsC173VPA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.2.tgz#add343f7a69a2bad7f7195a616ea4fd75abcb223" - integrity sha512-s8yfkAY1xRRc/WHkrC0mDJAW3j28b/w0EMIKv+IKi6xOExqZ9/PxWDC7HIdHt3lTvHf3I9jHumypZwNyC4PP1A== +"@abp/jquery@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.3.tgz#be70aa671129fac192b8f858a973e65018960cbd" + integrity sha512-sUy0aquZPq+HyxChYJMTjUZxaTo5/Aav5JcbMq1RczIFidjOrFHthWnYZveDVSKryaCfX3tXutag1sPakUOTtg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" jquery "~3.6.0" -"@abp/lodash@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.2.tgz#b3bfc70be099aae436badb4840a1f9715af5db36" - integrity sha512-IkeNEy8uiONy3VoHS7FVIL/bQVzTD1prmRMJ78dYNP8Qn317pG5/NEOgJXbka0zqR/mb2gXDg13kwlffsJWWlw== +"@abp/lodash@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.3.tgz#365684a338ab5d68adffa93207d0035eaa494ef9" + integrity sha512-Lqb2DkmKBPBHNbUd1QeATv8G/qUPamd06bKbe7xHesX3DZtlIwTmimwTpV4tqmJqOLKB67uUtapPYCfKyxs1RQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" lodash "^4.17.21" -"@abp/luxon@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.2.tgz#4d6039505d13edb30ef8b2f00bca69639cd2afd2" - integrity sha512-uxym895NuCsi5KE7JwiL2d+MnJMXZIu8xCutb0NtT89BvfjeZnAv8FOr4NjaYg+pmxTyj1i9RmBzfYsz0yvmkQ== +"@abp/luxon@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.3.tgz#97a60ae64e865d2b1c04107302d4ec50d4e09217" + integrity sha512-/7Lb463HREBFlt17tUFinTpYxfbZ8UIi1+d7Fqp8spJv78qCxvpWmD4iuJJJdCExO00ztZWY9GkCDPrAbfP/dA== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.2.tgz#99188d4b6497384720cf7168c909d32a39eff8a4" - integrity sha512-d2UcBQt4w7VqZdJjdb+JJpp9mFli7WbK7SrRTUeIINdKo3x4nrABbuKUgMBNxkroDVi1ErI0I4gwsVAGrMUPFw== +"@abp/malihu-custom-scrollbar-plugin@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.3.tgz#96be03f79be929b1a2cb67acb38e9d6638f04f15" + integrity sha512-hr5qmcVl+Wr6sIS10QerWRTfFvhmhq9e48G9Hx5oQZFjrIkfJRlxla0TYViHR2tRYCeDQGb4gYmN4Fc71mdcPg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.2.tgz#b39ddab8f0be539a880bdff7bc3307d9596a545d" - integrity sha512-JAf8LceHL5SUDBYRZ2BTpfIBRc4xyhE+9uo4ZqXXstLpJUUoaW2WlTSCNlBakSlR9k4Fprk9RjqVcrpNuWN+ew== +"@abp/select2@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.3.tgz#bdb8de1fcc5c9964233fdf1d4b88f7b90099f293" + integrity sha512-yk4CDpgksM5pAXMgFnULlgDovBk0oeXRhAA6lpt0TizzJ353WkpcASUblHbWOePzXbJFBBB2cj3XBD9vdWx7Ig== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.2.tgz#1ddb2caf2e82b6f0faa3420beda8a491c51fb1df" - integrity sha512-JSV33EVAK7y1VaYQf9HBLFjVkfUHvb3aeIta/xu0Wbw17JyJHrjlk/H0Z4ihkjPcCU2CDqVJCUUzhjdFFjHNag== +"@abp/sweetalert2@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.3.tgz#54a2d45ddbdaa2f7a4485aa5731f2fec65a9c771" + integrity sha512-Lbw6S+xTNMtHeFaMJNbYTMtqznDwRtlN4+f+hRGWbqNIpHuMfTi1jUgdeZTYRjbhY+RTduUJrs8lvvPMKWgrTw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.2.tgz#cb85f15a06cb85f82cdfa0c1454b20258014f613" - integrity sha512-jjUI+R4vRe/k9I2In5tp9PNKsf1quldVZA16vKRfxkF8TrN05RBF9ks5H+zlbe//okVCVl1Gz5MVt3XP7arEig== +"@abp/timeago@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.3.tgz#6e13a178d67e635ebe65d01db220d09f1673bafa" + integrity sha512-mBwaioPVnIeMXP6tDG24NZaTCAGvk8cMah8ems3OLWNK+tsPU4Jy8BVHTSmd/7rA69EL0REuSw2GmiCvaCL+RQ== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" timeago "^1.6.7" -"@abp/toastr@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.2.tgz#f714ff89267d5e375fa2c0c8bef40f3eeacedfe8" - integrity sha512-9ZTSo+4X4cuLdfOwGBWACMS4/379BulFsMW5kcDxFWW/EYhQ2ieE/CclYMeiOqeIL92rmurdVMHeum0MSH6hbg== +"@abp/toastr@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.3.tgz#a3d2d19963fe96da9566a0f320c7f9911901e69a" + integrity sha512-F1FJPQ0nnu/jZY4XpJFS7uFJgpoEl8aOeFkm6kvshK76ABFLvsWHYW88htW5gXIwOf+G/QClZdx39Os+IQaUJw== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" toastr "^2.1.4" -"@abp/utils@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.2.tgz#03111ac799363db8948cc4b905b7eea437b01fb3" - integrity sha512-ZPrhzl+NiCXxudIv+XozMzwiIWM70AQo8VXl9el8pYiQH0oiEOcT4ny+VmWdMU/94ouW0F3h1cjpYGeJSUWO/w== +"@abp/utils@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.3.tgz#b47f11cb9a0ac963a7f4e5a44360d933e19896fc" + integrity sha512-owTYsROGHfXuHTOFe1uKMAwLbgjzQLKDnmApUy4taYy93rWsu98vFXX6rYJTK7U/X8nZq5y0BtH4covHyfsAxQ== dependencies: just-compare "^1.3.0" 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 fbb558892e..62a79b49e6 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": "^5.3.2", - "@abp/prismjs": "^5.3.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.3", + "@abp/prismjs": "^5.3.3" }, "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 bf9cff2f59..6291ec8bf6 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,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.2.tgz#d0798086ffcad7d0e58c1127cb212012c97f5c9f" - integrity sha512-FJeTr7ePMvBrMN018qWDjhT7xcmNgIBjes6XkE1V7h8Tc6Wyn5aBvXrrqEr1v4FbKm214t1VQy7NudIjMF/UFw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.2.tgz#7ffe5199d7df25b043919592edfbd15c5033acd6" - integrity sha512-8C6QTUqKfi2wCGo+uSZi4tEtPog/E/+F+jBDfT8tFj3eZ8UFZXwYFGUKKt/m1KsVCJ0ItHj1FxKSlpvgadcmtg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.2" - "@abp/bootstrap" "~5.3.2" - "@abp/bootstrap-datepicker" "~5.3.2" - "@abp/datatables.net-bs5" "~5.3.2" - "@abp/font-awesome" "~5.3.2" - "@abp/jquery-form" "~5.3.2" - "@abp/jquery-validation-unobtrusive" "~5.3.2" - "@abp/lodash" "~5.3.2" - "@abp/luxon" "~5.3.2" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.2" - "@abp/select2" "~5.3.2" - "@abp/sweetalert2" "~5.3.2" - "@abp/timeago" "~5.3.2" - "@abp/toastr" "~5.3.2" - -"@abp/aspnetcore.mvc.ui@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.2.tgz#59c8ba140898260c0e1f0612f135af17bd5ae146" - integrity sha512-o12lXWhckLsvYn7xmlOgsUot0WVc/Mljfrf/HIpyzntW1jL0aqGgnG4bNVDlF77fXiPlwK/7WpwHKugqXMPOPQ== +"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.3.tgz#dc6a1bdd583ef5ea0f8a0110753b0869d5f1cb61" + integrity sha512-det7xCtVZK6Dmvr0ENAkYdE+jRW0cVi3BCKZc7c6Hy0VKsKsKlnyz5j/D2rJSAmrap9hyQSWXBJUiho8W92wUQ== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.3" + +"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.3.tgz#65f97d787647e7760bb0c2a5b0f0ff815dc9630a" + integrity sha512-p/Z++QPM7S2lm7obXsZXIarcw0Y88y/Ghy5hyZqdc3uNHL6j8LRlD2qfuRXzl0k9HytXa859UKtSMLSZij1DiA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~5.3.3" + "@abp/bootstrap" "~5.3.3" + "@abp/bootstrap-datepicker" "~5.3.3" + "@abp/datatables.net-bs5" "~5.3.3" + "@abp/font-awesome" "~5.3.3" + "@abp/jquery-form" "~5.3.3" + "@abp/jquery-validation-unobtrusive" "~5.3.3" + "@abp/lodash" "~5.3.3" + "@abp/luxon" "~5.3.3" + "@abp/malihu-custom-scrollbar-plugin" "~5.3.3" + "@abp/select2" "~5.3.3" + "@abp/sweetalert2" "~5.3.3" + "@abp/timeago" "~5.3.3" + "@abp/toastr" "~5.3.3" + +"@abp/aspnetcore.mvc.ui@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.3.tgz#b8beb98bde3e4f0340335014ced7653c7913a621" + integrity sha512-aDQxdfQmlEXIjWGW8wru58imh9cncHAijafvdXlmyfKHM2JfnSSCG/RPMiaoJq/iyDVEggbhx8z4VHODC1eitg== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,161 +41,161 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.2.tgz#065b6d5b4dc484ed4c34c01209d319027e8967ea" - integrity sha512-uA2g1sThLIvGwirbLWLxExw46jnC63jjjs8aO5qSOrGrGfT6XB1OLgnnOPdFacZqPjYneGZ7ULXvOzGh2SsBYQ== +"@abp/bootstrap-datepicker@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.3.tgz#66bf2be128e6389877ed4465149c1933ca182c71" + integrity sha512-w/gPj4BVzVnmwekWVHKPYkwnhZFFH1XtCtw5LeJVM5bSYQBrvVTvvUPdKiiTDV59OYf2sbsA+PscwcTWAG6t/Q== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.2.tgz#7b2663b1d5b0ba8cd079dfb020e26b01fced3118" - integrity sha512-tdbzywiDnbsjNdOY0QBGYD/AtgchGSY7JQZoYczN9Rk4IZr7Axy1Dkw3sP/UBOQrxIOdUGlTEg2bi0MzAmTTig== +"@abp/bootstrap@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.3.tgz#56335b46bd42fba0a522712fbb6591fb6aeb5b68" + integrity sha512-xOtC690pE+QxZYhhQrpTE1rapEjg9BrJg7e0qvrkt4TLMZ4mIbau6/Qlh6x8uuMASCUUuRTLNUzHijxvOJh7Mg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" bootstrap "^5.1.3" -"@abp/clipboard@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-5.3.2.tgz#f1c00a66b3bbe46459b8f022fd54c098a9504673" - integrity sha512-e9TvKtBziGCmWw+lysqvd5CxqaIT2+L5anAx4xujiZR6EnBApLLqprlJyH7yAsxI4LJcKdBA+oj65xBtjVOm3w== +"@abp/clipboard@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-5.3.3.tgz#62c3c12f1ff503091924f672f71a50e2e5d0b47c" + integrity sha512-FRJPM9/P3WPuK4Id1KVfmpkOB3MrlrYp/beNqZtjqQuG8WDjVgnHrDnsPYfzeLdK5n6bEvtGWwtHwiaBOXhWZg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" clipboard "^2.0.8" -"@abp/core@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.2.tgz#f16026cdfd993c78904a5afe6642b5da8fbc6707" - integrity sha512-kCS8XtL2UyqYavWYGN8SY2A9PKdY5fJxKBEB6GMin4v6LzJB8f7auomLY+gFJs0PjG2rYcyT7sgVijNlOs4ypg== +"@abp/core@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.3.tgz#b03fc281d650d483c9276591f2adb26ea43dcd1e" + integrity sha512-Pp8U+LjchtSxc9lTRaPNQhb+Eh7X2LVERmZvoWyET0y/st28PJZ4eZ4iyGmV00pEmCpadF5aTWVhJcGH32scdQ== dependencies: - "@abp/utils" "~5.3.2" + "@abp/utils" "~5.3.3" -"@abp/datatables.net-bs5@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.2.tgz#bcccfe383ea271f845d25134307c2b407a513c33" - integrity sha512-MTaJW8LKvxOqzWFqmSZP3RcI3ygzB9sC8gH6J3ayILIXuMR+MjWe2OEMYAAQaT/582pME1wHtbp/dthkz6cmRQ== +"@abp/datatables.net-bs5@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.3.tgz#e00304fbe7e6d9d33e1082485f7aa07de48fac0c" + integrity sha512-dkbP3PPkMRJqxravYO7NIVww+MQC3FxHP7mPCg/+PG/LttaNJ5L5hoNcb7BMK2K76hBRMdvlSIzvjycb1w1ooA== dependencies: - "@abp/datatables.net" "~5.3.2" + "@abp/datatables.net" "~5.3.3" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.2.tgz#870959555907cad03dbcb8b3866f2be4aea7a16e" - integrity sha512-7F3dCqBmBzm8h6cM1tl8JG1eras7GaSbDKqJY3CqVCnDgJsk1O966p0VrZjWBxWKJrCoQCDX7+vid9UJlo/1aw== +"@abp/datatables.net@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.3.tgz#6d8eca1034e26708b9adf0d5917aefd5772cbf30" + integrity sha512-1JuXMzHDtrvGRNBYdwEVobiYmhd7VxM432ciARX8hzvSkE0jcgzeTrSlBXfenFMPOIAUJsSOE4YVshtqrY0G4g== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.2.tgz#2ae82288e1c4d664b673d2d7ec264f05fac98d7a" - integrity sha512-ZXNbI+U++Kz73FAEtWCc6KMZYQehqOQCSPEC4AfpYptK6fQ4weTARWzdfWcXluNSPeBtdl3Of+IR4TRjjUEyPA== +"@abp/font-awesome@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.3.tgz#b10a530c9dee28838536746ea2a40342ff2ee3a8" + integrity sha512-c+cvsQ1uolSoyTkM9rZYYM07iiq/Zu8zKOQaDbitQMfPkcfSnC3PG/PTNauSYuwh/SyFfacFXeaDQ5Y/kAGRLw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.2.tgz#0dc63c9b546a4aef4967fad90e6cd010aae976fa" - integrity sha512-S6lWlz32RgZj+ETrg214kOm5++HNiW4ftNRP4DMbwkq3dHvRvHqywdmVLfwaRciAsYpGqu0fl6T4P2WHiPRw2w== +"@abp/jquery-form@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.3.tgz#94234207aa991e098e49e7d1244dc86d289a48e6" + integrity sha512-TY5c4ODfSidYGWqUR+QMNbxasfSufSg9gLY8lTEaJn2Wd2+o3GlauPxlTeNIRCRsxqb8e5+fBJspq1YbtE8vQg== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.2.tgz#91a393a24ab60fce366c65ba23bddf36411da7cb" - integrity sha512-8V99Oaff6P7dQ46klCcl/CmC1OY6MJ43SyUnOltRCVeIodga8wK8rgvJFM5tYZQVmIdNtdxrUziNMw611N+3Uw== +"@abp/jquery-validation-unobtrusive@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.3.tgz#03f776807b60f32d2470c3d3c975ee20f33a993d" + integrity sha512-BNa2oSOfc5CSLW62SLCOinP7ybDDSVjfn0LYdDOdkIpSPnoL/3E1ZmgEzkDCUdTfJ67320kGDtIHCpb+Wbik+Q== dependencies: - "@abp/jquery-validation" "~5.3.2" + "@abp/jquery-validation" "~5.3.3" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.2.tgz#18a0f7ca797adebe9393732a62251760f34f66f0" - integrity sha512-uokx6CKtHlu8WCe3YogPi+24KG15hOi7vvtiwvwZ2dV9rJpbAnDYnq7NLwjh1JFlRGsPp8vpLi9m9zilKf1CDg== +"@abp/jquery-validation@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.3.tgz#a0544428b94966f35d3aebb40c354d3f4485137d" + integrity sha512-GFhrS4pVmbQRI0eiW2aBYmRTB0rR2s3Wj4NIVB69ZHwvy+uADA3M/oMs8Q4wuT+gmPu2GCjPNCc5RPsC173VPA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.2.tgz#add343f7a69a2bad7f7195a616ea4fd75abcb223" - integrity sha512-s8yfkAY1xRRc/WHkrC0mDJAW3j28b/w0EMIKv+IKi6xOExqZ9/PxWDC7HIdHt3lTvHf3I9jHumypZwNyC4PP1A== +"@abp/jquery@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.3.tgz#be70aa671129fac192b8f858a973e65018960cbd" + integrity sha512-sUy0aquZPq+HyxChYJMTjUZxaTo5/Aav5JcbMq1RczIFidjOrFHthWnYZveDVSKryaCfX3tXutag1sPakUOTtg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" jquery "~3.6.0" -"@abp/lodash@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.2.tgz#b3bfc70be099aae436badb4840a1f9715af5db36" - integrity sha512-IkeNEy8uiONy3VoHS7FVIL/bQVzTD1prmRMJ78dYNP8Qn317pG5/NEOgJXbka0zqR/mb2gXDg13kwlffsJWWlw== +"@abp/lodash@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.3.tgz#365684a338ab5d68adffa93207d0035eaa494ef9" + integrity sha512-Lqb2DkmKBPBHNbUd1QeATv8G/qUPamd06bKbe7xHesX3DZtlIwTmimwTpV4tqmJqOLKB67uUtapPYCfKyxs1RQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" lodash "^4.17.21" -"@abp/luxon@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.2.tgz#4d6039505d13edb30ef8b2f00bca69639cd2afd2" - integrity sha512-uxym895NuCsi5KE7JwiL2d+MnJMXZIu8xCutb0NtT89BvfjeZnAv8FOr4NjaYg+pmxTyj1i9RmBzfYsz0yvmkQ== +"@abp/luxon@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.3.tgz#97a60ae64e865d2b1c04107302d4ec50d4e09217" + integrity sha512-/7Lb463HREBFlt17tUFinTpYxfbZ8UIi1+d7Fqp8spJv78qCxvpWmD4iuJJJdCExO00ztZWY9GkCDPrAbfP/dA== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.2.tgz#99188d4b6497384720cf7168c909d32a39eff8a4" - integrity sha512-d2UcBQt4w7VqZdJjdb+JJpp9mFli7WbK7SrRTUeIINdKo3x4nrABbuKUgMBNxkroDVi1ErI0I4gwsVAGrMUPFw== +"@abp/malihu-custom-scrollbar-plugin@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.3.tgz#96be03f79be929b1a2cb67acb38e9d6638f04f15" + integrity sha512-hr5qmcVl+Wr6sIS10QerWRTfFvhmhq9e48G9Hx5oQZFjrIkfJRlxla0TYViHR2tRYCeDQGb4gYmN4Fc71mdcPg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/prismjs@^5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-5.3.2.tgz#76299d4eec3a41d518738bc0a94dc74e61552481" - integrity sha512-QwIGhUjWCWAi9lqrMIMEybjGM1WkADAFFhLB9R+Nk5Cj4dlgVe1PekypbWV0e3r300H6ZqJmgPcagKVG3G4bWg== +"@abp/prismjs@^5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-5.3.3.tgz#eccea1469cb4dfc15b87704d267bb36ad6f25758" + integrity sha512-XC0jQa9LqcuqpciDKSbc0wRo4sOK9sebX6eZBlbOnGIoHhNNbiwG0Vt60MHQ5DmaOz7k5jWP0gOISQMJ5GJfTw== dependencies: - "@abp/clipboard" "~5.3.2" - "@abp/core" "~5.3.2" + "@abp/clipboard" "~5.3.3" + "@abp/core" "~5.3.3" prismjs "^1.26.0" -"@abp/select2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.2.tgz#b39ddab8f0be539a880bdff7bc3307d9596a545d" - integrity sha512-JAf8LceHL5SUDBYRZ2BTpfIBRc4xyhE+9uo4ZqXXstLpJUUoaW2WlTSCNlBakSlR9k4Fprk9RjqVcrpNuWN+ew== +"@abp/select2@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.3.tgz#bdb8de1fcc5c9964233fdf1d4b88f7b90099f293" + integrity sha512-yk4CDpgksM5pAXMgFnULlgDovBk0oeXRhAA6lpt0TizzJ353WkpcASUblHbWOePzXbJFBBB2cj3XBD9vdWx7Ig== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.2.tgz#1ddb2caf2e82b6f0faa3420beda8a491c51fb1df" - integrity sha512-JSV33EVAK7y1VaYQf9HBLFjVkfUHvb3aeIta/xu0Wbw17JyJHrjlk/H0Z4ihkjPcCU2CDqVJCUUzhjdFFjHNag== +"@abp/sweetalert2@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.3.tgz#54a2d45ddbdaa2f7a4485aa5731f2fec65a9c771" + integrity sha512-Lbw6S+xTNMtHeFaMJNbYTMtqznDwRtlN4+f+hRGWbqNIpHuMfTi1jUgdeZTYRjbhY+RTduUJrs8lvvPMKWgrTw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.2.tgz#cb85f15a06cb85f82cdfa0c1454b20258014f613" - integrity sha512-jjUI+R4vRe/k9I2In5tp9PNKsf1quldVZA16vKRfxkF8TrN05RBF9ks5H+zlbe//okVCVl1Gz5MVt3XP7arEig== +"@abp/timeago@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.3.tgz#6e13a178d67e635ebe65d01db220d09f1673bafa" + integrity sha512-mBwaioPVnIeMXP6tDG24NZaTCAGvk8cMah8ems3OLWNK+tsPU4Jy8BVHTSmd/7rA69EL0REuSw2GmiCvaCL+RQ== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" timeago "^1.6.7" -"@abp/toastr@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.2.tgz#f714ff89267d5e375fa2c0c8bef40f3eeacedfe8" - integrity sha512-9ZTSo+4X4cuLdfOwGBWACMS4/379BulFsMW5kcDxFWW/EYhQ2ieE/CclYMeiOqeIL92rmurdVMHeum0MSH6hbg== +"@abp/toastr@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.3.tgz#a3d2d19963fe96da9566a0f320c7f9911901e69a" + integrity sha512-F1FJPQ0nnu/jZY4XpJFS7uFJgpoEl8aOeFkm6kvshK76ABFLvsWHYW88htW5gXIwOf+G/QClZdx39Os+IQaUJw== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" toastr "^2.1.4" -"@abp/utils@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.2.tgz#03111ac799363db8948cc4b905b7eea437b01fb3" - integrity sha512-ZPrhzl+NiCXxudIv+XozMzwiIWM70AQo8VXl9el8pYiQH0oiEOcT4ny+VmWdMU/94ouW0F3h1cjpYGeJSUWO/w== +"@abp/utils@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.3.tgz#b47f11cb9a0ac963a7f4e5a44360d933e19896fc" + integrity sha512-owTYsROGHfXuHTOFe1uKMAwLbgjzQLKDnmApUy4taYy93rWsu98vFXX6rYJTK7U/X8nZq5y0BtH4covHyfsAxQ== dependencies: just-compare "^1.3.0" diff --git a/modules/blogging/app/Volo.BloggingTestApp/package.json b/modules/blogging/app/Volo.BloggingTestApp/package.json index 65b331c1fc..74dc82cda9 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": "^5.3.2", - "@abp/blogging": "^5.3.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.3", + "@abp/blogging": "^5.3.3" } } diff --git a/modules/blogging/app/Volo.BloggingTestApp/yarn.lock b/modules/blogging/app/Volo.BloggingTestApp/yarn.lock index a070d65619..0c0d9a0db9 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/yarn.lock +++ b/modules/blogging/app/Volo.BloggingTestApp/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.2.tgz#d0798086ffcad7d0e58c1127cb212012c97f5c9f" - integrity sha512-FJeTr7ePMvBrMN018qWDjhT7xcmNgIBjes6XkE1V7h8Tc6Wyn5aBvXrrqEr1v4FbKm214t1VQy7NudIjMF/UFw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.2.tgz#7ffe5199d7df25b043919592edfbd15c5033acd6" - integrity sha512-8C6QTUqKfi2wCGo+uSZi4tEtPog/E/+F+jBDfT8tFj3eZ8UFZXwYFGUKKt/m1KsVCJ0ItHj1FxKSlpvgadcmtg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.2" - "@abp/bootstrap" "~5.3.2" - "@abp/bootstrap-datepicker" "~5.3.2" - "@abp/datatables.net-bs5" "~5.3.2" - "@abp/font-awesome" "~5.3.2" - "@abp/jquery-form" "~5.3.2" - "@abp/jquery-validation-unobtrusive" "~5.3.2" - "@abp/lodash" "~5.3.2" - "@abp/luxon" "~5.3.2" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.2" - "@abp/select2" "~5.3.2" - "@abp/sweetalert2" "~5.3.2" - "@abp/timeago" "~5.3.2" - "@abp/toastr" "~5.3.2" - -"@abp/aspnetcore.mvc.ui@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.2.tgz#59c8ba140898260c0e1f0612f135af17bd5ae146" - integrity sha512-o12lXWhckLsvYn7xmlOgsUot0WVc/Mljfrf/HIpyzntW1jL0aqGgnG4bNVDlF77fXiPlwK/7WpwHKugqXMPOPQ== +"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.3.tgz#dc6a1bdd583ef5ea0f8a0110753b0869d5f1cb61" + integrity sha512-det7xCtVZK6Dmvr0ENAkYdE+jRW0cVi3BCKZc7c6Hy0VKsKsKlnyz5j/D2rJSAmrap9hyQSWXBJUiho8W92wUQ== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.3" + +"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.3.tgz#65f97d787647e7760bb0c2a5b0f0ff815dc9630a" + integrity sha512-p/Z++QPM7S2lm7obXsZXIarcw0Y88y/Ghy5hyZqdc3uNHL6j8LRlD2qfuRXzl0k9HytXa859UKtSMLSZij1DiA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~5.3.3" + "@abp/bootstrap" "~5.3.3" + "@abp/bootstrap-datepicker" "~5.3.3" + "@abp/datatables.net-bs5" "~5.3.3" + "@abp/font-awesome" "~5.3.3" + "@abp/jquery-form" "~5.3.3" + "@abp/jquery-validation-unobtrusive" "~5.3.3" + "@abp/lodash" "~5.3.3" + "@abp/luxon" "~5.3.3" + "@abp/malihu-custom-scrollbar-plugin" "~5.3.3" + "@abp/select2" "~5.3.3" + "@abp/sweetalert2" "~5.3.3" + "@abp/timeago" "~5.3.3" + "@abp/toastr" "~5.3.3" + +"@abp/aspnetcore.mvc.ui@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.3.tgz#b8beb98bde3e4f0340335014ced7653c7913a621" + integrity sha512-aDQxdfQmlEXIjWGW8wru58imh9cncHAijafvdXlmyfKHM2JfnSSCG/RPMiaoJq/iyDVEggbhx8z4VHODC1eitg== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,187 +41,187 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/blogging@^5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-5.3.2.tgz#57564c54b27051a576376d84f6ecc42219cecac1" - integrity sha512-UIF+qAIeJa4+Y8YX7Ik86y+MNFRhqULZ1M1tkqz4AfYeUqrU4qHj7lq3ioFxAX3P9iWP7g341tLf2uy3cTCS6Q== +"@abp/blogging@^5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-5.3.3.tgz#b2be335e0e54fd59b5542e28d447d048bcfb0c4c" + integrity sha512-eMs3IzErwnQ4XG/NJXk3xRF0tEOStetx7EBWHvF423NK8fW4tvM5imy+Q44LXYSqHQgz39ekIslov/mtD2lHQw== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.2" - "@abp/owl.carousel" "~5.3.2" - "@abp/prismjs" "~5.3.2" - "@abp/tui-editor" "~5.3.2" + "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.3" + "@abp/owl.carousel" "~5.3.3" + "@abp/prismjs" "~5.3.3" + "@abp/tui-editor" "~5.3.3" -"@abp/bootstrap-datepicker@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.2.tgz#065b6d5b4dc484ed4c34c01209d319027e8967ea" - integrity sha512-uA2g1sThLIvGwirbLWLxExw46jnC63jjjs8aO5qSOrGrGfT6XB1OLgnnOPdFacZqPjYneGZ7ULXvOzGh2SsBYQ== +"@abp/bootstrap-datepicker@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.3.tgz#66bf2be128e6389877ed4465149c1933ca182c71" + integrity sha512-w/gPj4BVzVnmwekWVHKPYkwnhZFFH1XtCtw5LeJVM5bSYQBrvVTvvUPdKiiTDV59OYf2sbsA+PscwcTWAG6t/Q== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.2.tgz#7b2663b1d5b0ba8cd079dfb020e26b01fced3118" - integrity sha512-tdbzywiDnbsjNdOY0QBGYD/AtgchGSY7JQZoYczN9Rk4IZr7Axy1Dkw3sP/UBOQrxIOdUGlTEg2bi0MzAmTTig== +"@abp/bootstrap@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.3.tgz#56335b46bd42fba0a522712fbb6591fb6aeb5b68" + integrity sha512-xOtC690pE+QxZYhhQrpTE1rapEjg9BrJg7e0qvrkt4TLMZ4mIbau6/Qlh6x8uuMASCUUuRTLNUzHijxvOJh7Mg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" bootstrap "^5.1.3" -"@abp/clipboard@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-5.3.2.tgz#f1c00a66b3bbe46459b8f022fd54c098a9504673" - integrity sha512-e9TvKtBziGCmWw+lysqvd5CxqaIT2+L5anAx4xujiZR6EnBApLLqprlJyH7yAsxI4LJcKdBA+oj65xBtjVOm3w== +"@abp/clipboard@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-5.3.3.tgz#62c3c12f1ff503091924f672f71a50e2e5d0b47c" + integrity sha512-FRJPM9/P3WPuK4Id1KVfmpkOB3MrlrYp/beNqZtjqQuG8WDjVgnHrDnsPYfzeLdK5n6bEvtGWwtHwiaBOXhWZg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" clipboard "^2.0.8" -"@abp/core@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.2.tgz#f16026cdfd993c78904a5afe6642b5da8fbc6707" - integrity sha512-kCS8XtL2UyqYavWYGN8SY2A9PKdY5fJxKBEB6GMin4v6LzJB8f7auomLY+gFJs0PjG2rYcyT7sgVijNlOs4ypg== +"@abp/core@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.3.tgz#b03fc281d650d483c9276591f2adb26ea43dcd1e" + integrity sha512-Pp8U+LjchtSxc9lTRaPNQhb+Eh7X2LVERmZvoWyET0y/st28PJZ4eZ4iyGmV00pEmCpadF5aTWVhJcGH32scdQ== dependencies: - "@abp/utils" "~5.3.2" + "@abp/utils" "~5.3.3" -"@abp/datatables.net-bs5@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.2.tgz#bcccfe383ea271f845d25134307c2b407a513c33" - integrity sha512-MTaJW8LKvxOqzWFqmSZP3RcI3ygzB9sC8gH6J3ayILIXuMR+MjWe2OEMYAAQaT/582pME1wHtbp/dthkz6cmRQ== +"@abp/datatables.net-bs5@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.3.tgz#e00304fbe7e6d9d33e1082485f7aa07de48fac0c" + integrity sha512-dkbP3PPkMRJqxravYO7NIVww+MQC3FxHP7mPCg/+PG/LttaNJ5L5hoNcb7BMK2K76hBRMdvlSIzvjycb1w1ooA== dependencies: - "@abp/datatables.net" "~5.3.2" + "@abp/datatables.net" "~5.3.3" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.2.tgz#870959555907cad03dbcb8b3866f2be4aea7a16e" - integrity sha512-7F3dCqBmBzm8h6cM1tl8JG1eras7GaSbDKqJY3CqVCnDgJsk1O966p0VrZjWBxWKJrCoQCDX7+vid9UJlo/1aw== +"@abp/datatables.net@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.3.tgz#6d8eca1034e26708b9adf0d5917aefd5772cbf30" + integrity sha512-1JuXMzHDtrvGRNBYdwEVobiYmhd7VxM432ciARX8hzvSkE0jcgzeTrSlBXfenFMPOIAUJsSOE4YVshtqrY0G4g== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.2.tgz#2ae82288e1c4d664b673d2d7ec264f05fac98d7a" - integrity sha512-ZXNbI+U++Kz73FAEtWCc6KMZYQehqOQCSPEC4AfpYptK6fQ4weTARWzdfWcXluNSPeBtdl3Of+IR4TRjjUEyPA== +"@abp/font-awesome@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.3.tgz#b10a530c9dee28838536746ea2a40342ff2ee3a8" + integrity sha512-c+cvsQ1uolSoyTkM9rZYYM07iiq/Zu8zKOQaDbitQMfPkcfSnC3PG/PTNauSYuwh/SyFfacFXeaDQ5Y/kAGRLw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.2.tgz#0dc63c9b546a4aef4967fad90e6cd010aae976fa" - integrity sha512-S6lWlz32RgZj+ETrg214kOm5++HNiW4ftNRP4DMbwkq3dHvRvHqywdmVLfwaRciAsYpGqu0fl6T4P2WHiPRw2w== +"@abp/jquery-form@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.3.tgz#94234207aa991e098e49e7d1244dc86d289a48e6" + integrity sha512-TY5c4ODfSidYGWqUR+QMNbxasfSufSg9gLY8lTEaJn2Wd2+o3GlauPxlTeNIRCRsxqb8e5+fBJspq1YbtE8vQg== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.2.tgz#91a393a24ab60fce366c65ba23bddf36411da7cb" - integrity sha512-8V99Oaff6P7dQ46klCcl/CmC1OY6MJ43SyUnOltRCVeIodga8wK8rgvJFM5tYZQVmIdNtdxrUziNMw611N+3Uw== +"@abp/jquery-validation-unobtrusive@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.3.tgz#03f776807b60f32d2470c3d3c975ee20f33a993d" + integrity sha512-BNa2oSOfc5CSLW62SLCOinP7ybDDSVjfn0LYdDOdkIpSPnoL/3E1ZmgEzkDCUdTfJ67320kGDtIHCpb+Wbik+Q== dependencies: - "@abp/jquery-validation" "~5.3.2" + "@abp/jquery-validation" "~5.3.3" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.2.tgz#18a0f7ca797adebe9393732a62251760f34f66f0" - integrity sha512-uokx6CKtHlu8WCe3YogPi+24KG15hOi7vvtiwvwZ2dV9rJpbAnDYnq7NLwjh1JFlRGsPp8vpLi9m9zilKf1CDg== +"@abp/jquery-validation@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.3.tgz#a0544428b94966f35d3aebb40c354d3f4485137d" + integrity sha512-GFhrS4pVmbQRI0eiW2aBYmRTB0rR2s3Wj4NIVB69ZHwvy+uADA3M/oMs8Q4wuT+gmPu2GCjPNCc5RPsC173VPA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.2.tgz#add343f7a69a2bad7f7195a616ea4fd75abcb223" - integrity sha512-s8yfkAY1xRRc/WHkrC0mDJAW3j28b/w0EMIKv+IKi6xOExqZ9/PxWDC7HIdHt3lTvHf3I9jHumypZwNyC4PP1A== +"@abp/jquery@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.3.tgz#be70aa671129fac192b8f858a973e65018960cbd" + integrity sha512-sUy0aquZPq+HyxChYJMTjUZxaTo5/Aav5JcbMq1RczIFidjOrFHthWnYZveDVSKryaCfX3tXutag1sPakUOTtg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" jquery "~3.6.0" -"@abp/lodash@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.2.tgz#b3bfc70be099aae436badb4840a1f9715af5db36" - integrity sha512-IkeNEy8uiONy3VoHS7FVIL/bQVzTD1prmRMJ78dYNP8Qn317pG5/NEOgJXbka0zqR/mb2gXDg13kwlffsJWWlw== +"@abp/lodash@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.3.tgz#365684a338ab5d68adffa93207d0035eaa494ef9" + integrity sha512-Lqb2DkmKBPBHNbUd1QeATv8G/qUPamd06bKbe7xHesX3DZtlIwTmimwTpV4tqmJqOLKB67uUtapPYCfKyxs1RQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" lodash "^4.17.21" -"@abp/luxon@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.2.tgz#4d6039505d13edb30ef8b2f00bca69639cd2afd2" - integrity sha512-uxym895NuCsi5KE7JwiL2d+MnJMXZIu8xCutb0NtT89BvfjeZnAv8FOr4NjaYg+pmxTyj1i9RmBzfYsz0yvmkQ== +"@abp/luxon@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.3.tgz#97a60ae64e865d2b1c04107302d4ec50d4e09217" + integrity sha512-/7Lb463HREBFlt17tUFinTpYxfbZ8UIi1+d7Fqp8spJv78qCxvpWmD4iuJJJdCExO00ztZWY9GkCDPrAbfP/dA== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.2.tgz#99188d4b6497384720cf7168c909d32a39eff8a4" - integrity sha512-d2UcBQt4w7VqZdJjdb+JJpp9mFli7WbK7SrRTUeIINdKo3x4nrABbuKUgMBNxkroDVi1ErI0I4gwsVAGrMUPFw== +"@abp/malihu-custom-scrollbar-plugin@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.3.tgz#96be03f79be929b1a2cb67acb38e9d6638f04f15" + integrity sha512-hr5qmcVl+Wr6sIS10QerWRTfFvhmhq9e48G9Hx5oQZFjrIkfJRlxla0TYViHR2tRYCeDQGb4gYmN4Fc71mdcPg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/owl.carousel@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-5.3.2.tgz#6e458cc6844d13e493eb10588481fff5d7846d88" - integrity sha512-4vNWPQncSV9FVbwgEEIQPp6IwQ5/nWgZi5JsrFDVllYtX/Q6BaFRnMl6MKoe7Ryz5JsM+brZXnCphbpRMZz1TQ== +"@abp/owl.carousel@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-5.3.3.tgz#72af5b9648c795a331a6213c685428cb6f4e9ddb" + integrity sha512-9cxU+gYa+Xbps44j/4PfdNLmOiwY4sqHxw6/UHdQ3x9jKM1uEPjWZ8KvhQHMc0G/wMPkBoosMTZhgf5fCt4YYg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" owl.carousel "^2.3.4" -"@abp/prismjs@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-5.3.2.tgz#76299d4eec3a41d518738bc0a94dc74e61552481" - integrity sha512-QwIGhUjWCWAi9lqrMIMEybjGM1WkADAFFhLB9R+Nk5Cj4dlgVe1PekypbWV0e3r300H6ZqJmgPcagKVG3G4bWg== +"@abp/prismjs@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-5.3.3.tgz#eccea1469cb4dfc15b87704d267bb36ad6f25758" + integrity sha512-XC0jQa9LqcuqpciDKSbc0wRo4sOK9sebX6eZBlbOnGIoHhNNbiwG0Vt60MHQ5DmaOz7k5jWP0gOISQMJ5GJfTw== dependencies: - "@abp/clipboard" "~5.3.2" - "@abp/core" "~5.3.2" + "@abp/clipboard" "~5.3.3" + "@abp/core" "~5.3.3" prismjs "^1.26.0" -"@abp/select2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.2.tgz#b39ddab8f0be539a880bdff7bc3307d9596a545d" - integrity sha512-JAf8LceHL5SUDBYRZ2BTpfIBRc4xyhE+9uo4ZqXXstLpJUUoaW2WlTSCNlBakSlR9k4Fprk9RjqVcrpNuWN+ew== +"@abp/select2@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.3.tgz#bdb8de1fcc5c9964233fdf1d4b88f7b90099f293" + integrity sha512-yk4CDpgksM5pAXMgFnULlgDovBk0oeXRhAA6lpt0TizzJ353WkpcASUblHbWOePzXbJFBBB2cj3XBD9vdWx7Ig== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.2.tgz#1ddb2caf2e82b6f0faa3420beda8a491c51fb1df" - integrity sha512-JSV33EVAK7y1VaYQf9HBLFjVkfUHvb3aeIta/xu0Wbw17JyJHrjlk/H0Z4ihkjPcCU2CDqVJCUUzhjdFFjHNag== +"@abp/sweetalert2@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.3.tgz#54a2d45ddbdaa2f7a4485aa5731f2fec65a9c771" + integrity sha512-Lbw6S+xTNMtHeFaMJNbYTMtqznDwRtlN4+f+hRGWbqNIpHuMfTi1jUgdeZTYRjbhY+RTduUJrs8lvvPMKWgrTw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.2.tgz#cb85f15a06cb85f82cdfa0c1454b20258014f613" - integrity sha512-jjUI+R4vRe/k9I2In5tp9PNKsf1quldVZA16vKRfxkF8TrN05RBF9ks5H+zlbe//okVCVl1Gz5MVt3XP7arEig== +"@abp/timeago@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.3.tgz#6e13a178d67e635ebe65d01db220d09f1673bafa" + integrity sha512-mBwaioPVnIeMXP6tDG24NZaTCAGvk8cMah8ems3OLWNK+tsPU4Jy8BVHTSmd/7rA69EL0REuSw2GmiCvaCL+RQ== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" timeago "^1.6.7" -"@abp/toastr@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.2.tgz#f714ff89267d5e375fa2c0c8bef40f3eeacedfe8" - integrity sha512-9ZTSo+4X4cuLdfOwGBWACMS4/379BulFsMW5kcDxFWW/EYhQ2ieE/CclYMeiOqeIL92rmurdVMHeum0MSH6hbg== +"@abp/toastr@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.3.tgz#a3d2d19963fe96da9566a0f320c7f9911901e69a" + integrity sha512-F1FJPQ0nnu/jZY4XpJFS7uFJgpoEl8aOeFkm6kvshK76ABFLvsWHYW88htW5gXIwOf+G/QClZdx39Os+IQaUJw== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" toastr "^2.1.4" -"@abp/tui-editor@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-5.3.2.tgz#6e7b88e61771b958e50465d569aca0f896c396d9" - integrity sha512-iXK+6sxjxPcMQEYRTnsW9njW/jcSUMQxPRGEeot/B5GIoyVQJNqMHmdiccsZQAp1L7t2OY5G+0HVjvXD3BZ6BQ== +"@abp/tui-editor@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-5.3.3.tgz#2c9f09fb8cf1dd98656d425f4f94896e9e3297ce" + integrity sha512-gXumOvfQc4D2e2fEG/nSja4sHwDARwnp2K41M7eSdaB/ENR0GT1SRfK24SdpnYSuzPnuhNR/GMY1c3jOJFNCRg== dependencies: - "@abp/jquery" "~5.3.2" - "@abp/prismjs" "~5.3.2" + "@abp/jquery" "~5.3.3" + "@abp/prismjs" "~5.3.3" -"@abp/utils@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.2.tgz#03111ac799363db8948cc4b905b7eea437b01fb3" - integrity sha512-ZPrhzl+NiCXxudIv+XozMzwiIWM70AQo8VXl9el8pYiQH0oiEOcT4ny+VmWdMU/94ouW0F3h1cjpYGeJSUWO/w== +"@abp/utils@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.3.tgz#b47f11cb9a0ac963a7f4e5a44360d933e19896fc" + integrity sha512-owTYsROGHfXuHTOFe1uKMAwLbgjzQLKDnmApUy4taYy93rWsu98vFXX6rYJTK7U/X8nZq5y0BtH4covHyfsAxQ== dependencies: just-compare "^1.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 09c813d7a9..a3129da17f 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": "^5.3.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.3" } } diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock index e8e53fa6bd..b16b62a682 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.2.tgz#d0798086ffcad7d0e58c1127cb212012c97f5c9f" - integrity sha512-FJeTr7ePMvBrMN018qWDjhT7xcmNgIBjes6XkE1V7h8Tc6Wyn5aBvXrrqEr1v4FbKm214t1VQy7NudIjMF/UFw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.2.tgz#7ffe5199d7df25b043919592edfbd15c5033acd6" - integrity sha512-8C6QTUqKfi2wCGo+uSZi4tEtPog/E/+F+jBDfT8tFj3eZ8UFZXwYFGUKKt/m1KsVCJ0ItHj1FxKSlpvgadcmtg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.2" - "@abp/bootstrap" "~5.3.2" - "@abp/bootstrap-datepicker" "~5.3.2" - "@abp/datatables.net-bs5" "~5.3.2" - "@abp/font-awesome" "~5.3.2" - "@abp/jquery-form" "~5.3.2" - "@abp/jquery-validation-unobtrusive" "~5.3.2" - "@abp/lodash" "~5.3.2" - "@abp/luxon" "~5.3.2" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.2" - "@abp/select2" "~5.3.2" - "@abp/sweetalert2" "~5.3.2" - "@abp/timeago" "~5.3.2" - "@abp/toastr" "~5.3.2" - -"@abp/aspnetcore.mvc.ui@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.2.tgz#59c8ba140898260c0e1f0612f135af17bd5ae146" - integrity sha512-o12lXWhckLsvYn7xmlOgsUot0WVc/Mljfrf/HIpyzntW1jL0aqGgnG4bNVDlF77fXiPlwK/7WpwHKugqXMPOPQ== +"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.3.tgz#dc6a1bdd583ef5ea0f8a0110753b0869d5f1cb61" + integrity sha512-det7xCtVZK6Dmvr0ENAkYdE+jRW0cVi3BCKZc7c6Hy0VKsKsKlnyz5j/D2rJSAmrap9hyQSWXBJUiho8W92wUQ== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.3" + +"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.3.tgz#65f97d787647e7760bb0c2a5b0f0ff815dc9630a" + integrity sha512-p/Z++QPM7S2lm7obXsZXIarcw0Y88y/Ghy5hyZqdc3uNHL6j8LRlD2qfuRXzl0k9HytXa859UKtSMLSZij1DiA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~5.3.3" + "@abp/bootstrap" "~5.3.3" + "@abp/bootstrap-datepicker" "~5.3.3" + "@abp/datatables.net-bs5" "~5.3.3" + "@abp/font-awesome" "~5.3.3" + "@abp/jquery-form" "~5.3.3" + "@abp/jquery-validation-unobtrusive" "~5.3.3" + "@abp/lodash" "~5.3.3" + "@abp/luxon" "~5.3.3" + "@abp/malihu-custom-scrollbar-plugin" "~5.3.3" + "@abp/select2" "~5.3.3" + "@abp/sweetalert2" "~5.3.3" + "@abp/timeago" "~5.3.3" + "@abp/toastr" "~5.3.3" + +"@abp/aspnetcore.mvc.ui@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.3.tgz#b8beb98bde3e4f0340335014ced7653c7913a621" + integrity sha512-aDQxdfQmlEXIjWGW8wru58imh9cncHAijafvdXlmyfKHM2JfnSSCG/RPMiaoJq/iyDVEggbhx8z4VHODC1eitg== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.2.tgz#065b6d5b4dc484ed4c34c01209d319027e8967ea" - integrity sha512-uA2g1sThLIvGwirbLWLxExw46jnC63jjjs8aO5qSOrGrGfT6XB1OLgnnOPdFacZqPjYneGZ7ULXvOzGh2SsBYQ== +"@abp/bootstrap-datepicker@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.3.tgz#66bf2be128e6389877ed4465149c1933ca182c71" + integrity sha512-w/gPj4BVzVnmwekWVHKPYkwnhZFFH1XtCtw5LeJVM5bSYQBrvVTvvUPdKiiTDV59OYf2sbsA+PscwcTWAG6t/Q== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.2.tgz#7b2663b1d5b0ba8cd079dfb020e26b01fced3118" - integrity sha512-tdbzywiDnbsjNdOY0QBGYD/AtgchGSY7JQZoYczN9Rk4IZr7Axy1Dkw3sP/UBOQrxIOdUGlTEg2bi0MzAmTTig== +"@abp/bootstrap@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.3.tgz#56335b46bd42fba0a522712fbb6591fb6aeb5b68" + integrity sha512-xOtC690pE+QxZYhhQrpTE1rapEjg9BrJg7e0qvrkt4TLMZ4mIbau6/Qlh6x8uuMASCUUuRTLNUzHijxvOJh7Mg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" bootstrap "^5.1.3" -"@abp/core@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.2.tgz#f16026cdfd993c78904a5afe6642b5da8fbc6707" - integrity sha512-kCS8XtL2UyqYavWYGN8SY2A9PKdY5fJxKBEB6GMin4v6LzJB8f7auomLY+gFJs0PjG2rYcyT7sgVijNlOs4ypg== +"@abp/core@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.3.tgz#b03fc281d650d483c9276591f2adb26ea43dcd1e" + integrity sha512-Pp8U+LjchtSxc9lTRaPNQhb+Eh7X2LVERmZvoWyET0y/st28PJZ4eZ4iyGmV00pEmCpadF5aTWVhJcGH32scdQ== dependencies: - "@abp/utils" "~5.3.2" + "@abp/utils" "~5.3.3" -"@abp/datatables.net-bs5@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.2.tgz#bcccfe383ea271f845d25134307c2b407a513c33" - integrity sha512-MTaJW8LKvxOqzWFqmSZP3RcI3ygzB9sC8gH6J3ayILIXuMR+MjWe2OEMYAAQaT/582pME1wHtbp/dthkz6cmRQ== +"@abp/datatables.net-bs5@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.3.tgz#e00304fbe7e6d9d33e1082485f7aa07de48fac0c" + integrity sha512-dkbP3PPkMRJqxravYO7NIVww+MQC3FxHP7mPCg/+PG/LttaNJ5L5hoNcb7BMK2K76hBRMdvlSIzvjycb1w1ooA== dependencies: - "@abp/datatables.net" "~5.3.2" + "@abp/datatables.net" "~5.3.3" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.2.tgz#870959555907cad03dbcb8b3866f2be4aea7a16e" - integrity sha512-7F3dCqBmBzm8h6cM1tl8JG1eras7GaSbDKqJY3CqVCnDgJsk1O966p0VrZjWBxWKJrCoQCDX7+vid9UJlo/1aw== +"@abp/datatables.net@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.3.tgz#6d8eca1034e26708b9adf0d5917aefd5772cbf30" + integrity sha512-1JuXMzHDtrvGRNBYdwEVobiYmhd7VxM432ciARX8hzvSkE0jcgzeTrSlBXfenFMPOIAUJsSOE4YVshtqrY0G4g== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.2.tgz#2ae82288e1c4d664b673d2d7ec264f05fac98d7a" - integrity sha512-ZXNbI+U++Kz73FAEtWCc6KMZYQehqOQCSPEC4AfpYptK6fQ4weTARWzdfWcXluNSPeBtdl3Of+IR4TRjjUEyPA== +"@abp/font-awesome@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.3.tgz#b10a530c9dee28838536746ea2a40342ff2ee3a8" + integrity sha512-c+cvsQ1uolSoyTkM9rZYYM07iiq/Zu8zKOQaDbitQMfPkcfSnC3PG/PTNauSYuwh/SyFfacFXeaDQ5Y/kAGRLw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.2.tgz#0dc63c9b546a4aef4967fad90e6cd010aae976fa" - integrity sha512-S6lWlz32RgZj+ETrg214kOm5++HNiW4ftNRP4DMbwkq3dHvRvHqywdmVLfwaRciAsYpGqu0fl6T4P2WHiPRw2w== +"@abp/jquery-form@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.3.tgz#94234207aa991e098e49e7d1244dc86d289a48e6" + integrity sha512-TY5c4ODfSidYGWqUR+QMNbxasfSufSg9gLY8lTEaJn2Wd2+o3GlauPxlTeNIRCRsxqb8e5+fBJspq1YbtE8vQg== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.2.tgz#91a393a24ab60fce366c65ba23bddf36411da7cb" - integrity sha512-8V99Oaff6P7dQ46klCcl/CmC1OY6MJ43SyUnOltRCVeIodga8wK8rgvJFM5tYZQVmIdNtdxrUziNMw611N+3Uw== +"@abp/jquery-validation-unobtrusive@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.3.tgz#03f776807b60f32d2470c3d3c975ee20f33a993d" + integrity sha512-BNa2oSOfc5CSLW62SLCOinP7ybDDSVjfn0LYdDOdkIpSPnoL/3E1ZmgEzkDCUdTfJ67320kGDtIHCpb+Wbik+Q== dependencies: - "@abp/jquery-validation" "~5.3.2" + "@abp/jquery-validation" "~5.3.3" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.2.tgz#18a0f7ca797adebe9393732a62251760f34f66f0" - integrity sha512-uokx6CKtHlu8WCe3YogPi+24KG15hOi7vvtiwvwZ2dV9rJpbAnDYnq7NLwjh1JFlRGsPp8vpLi9m9zilKf1CDg== +"@abp/jquery-validation@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.3.tgz#a0544428b94966f35d3aebb40c354d3f4485137d" + integrity sha512-GFhrS4pVmbQRI0eiW2aBYmRTB0rR2s3Wj4NIVB69ZHwvy+uADA3M/oMs8Q4wuT+gmPu2GCjPNCc5RPsC173VPA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.2.tgz#add343f7a69a2bad7f7195a616ea4fd75abcb223" - integrity sha512-s8yfkAY1xRRc/WHkrC0mDJAW3j28b/w0EMIKv+IKi6xOExqZ9/PxWDC7HIdHt3lTvHf3I9jHumypZwNyC4PP1A== +"@abp/jquery@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.3.tgz#be70aa671129fac192b8f858a973e65018960cbd" + integrity sha512-sUy0aquZPq+HyxChYJMTjUZxaTo5/Aav5JcbMq1RczIFidjOrFHthWnYZveDVSKryaCfX3tXutag1sPakUOTtg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" jquery "~3.6.0" -"@abp/lodash@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.2.tgz#b3bfc70be099aae436badb4840a1f9715af5db36" - integrity sha512-IkeNEy8uiONy3VoHS7FVIL/bQVzTD1prmRMJ78dYNP8Qn317pG5/NEOgJXbka0zqR/mb2gXDg13kwlffsJWWlw== +"@abp/lodash@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.3.tgz#365684a338ab5d68adffa93207d0035eaa494ef9" + integrity sha512-Lqb2DkmKBPBHNbUd1QeATv8G/qUPamd06bKbe7xHesX3DZtlIwTmimwTpV4tqmJqOLKB67uUtapPYCfKyxs1RQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" lodash "^4.17.21" -"@abp/luxon@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.2.tgz#4d6039505d13edb30ef8b2f00bca69639cd2afd2" - integrity sha512-uxym895NuCsi5KE7JwiL2d+MnJMXZIu8xCutb0NtT89BvfjeZnAv8FOr4NjaYg+pmxTyj1i9RmBzfYsz0yvmkQ== +"@abp/luxon@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.3.tgz#97a60ae64e865d2b1c04107302d4ec50d4e09217" + integrity sha512-/7Lb463HREBFlt17tUFinTpYxfbZ8UIi1+d7Fqp8spJv78qCxvpWmD4iuJJJdCExO00ztZWY9GkCDPrAbfP/dA== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.2.tgz#99188d4b6497384720cf7168c909d32a39eff8a4" - integrity sha512-d2UcBQt4w7VqZdJjdb+JJpp9mFli7WbK7SrRTUeIINdKo3x4nrABbuKUgMBNxkroDVi1ErI0I4gwsVAGrMUPFw== +"@abp/malihu-custom-scrollbar-plugin@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.3.tgz#96be03f79be929b1a2cb67acb38e9d6638f04f15" + integrity sha512-hr5qmcVl+Wr6sIS10QerWRTfFvhmhq9e48G9Hx5oQZFjrIkfJRlxla0TYViHR2tRYCeDQGb4gYmN4Fc71mdcPg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.2.tgz#b39ddab8f0be539a880bdff7bc3307d9596a545d" - integrity sha512-JAf8LceHL5SUDBYRZ2BTpfIBRc4xyhE+9uo4ZqXXstLpJUUoaW2WlTSCNlBakSlR9k4Fprk9RjqVcrpNuWN+ew== +"@abp/select2@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.3.tgz#bdb8de1fcc5c9964233fdf1d4b88f7b90099f293" + integrity sha512-yk4CDpgksM5pAXMgFnULlgDovBk0oeXRhAA6lpt0TizzJ353WkpcASUblHbWOePzXbJFBBB2cj3XBD9vdWx7Ig== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.2.tgz#1ddb2caf2e82b6f0faa3420beda8a491c51fb1df" - integrity sha512-JSV33EVAK7y1VaYQf9HBLFjVkfUHvb3aeIta/xu0Wbw17JyJHrjlk/H0Z4ihkjPcCU2CDqVJCUUzhjdFFjHNag== +"@abp/sweetalert2@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.3.tgz#54a2d45ddbdaa2f7a4485aa5731f2fec65a9c771" + integrity sha512-Lbw6S+xTNMtHeFaMJNbYTMtqznDwRtlN4+f+hRGWbqNIpHuMfTi1jUgdeZTYRjbhY+RTduUJrs8lvvPMKWgrTw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.2.tgz#cb85f15a06cb85f82cdfa0c1454b20258014f613" - integrity sha512-jjUI+R4vRe/k9I2In5tp9PNKsf1quldVZA16vKRfxkF8TrN05RBF9ks5H+zlbe//okVCVl1Gz5MVt3XP7arEig== +"@abp/timeago@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.3.tgz#6e13a178d67e635ebe65d01db220d09f1673bafa" + integrity sha512-mBwaioPVnIeMXP6tDG24NZaTCAGvk8cMah8ems3OLWNK+tsPU4Jy8BVHTSmd/7rA69EL0REuSw2GmiCvaCL+RQ== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" timeago "^1.6.7" -"@abp/toastr@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.2.tgz#f714ff89267d5e375fa2c0c8bef40f3eeacedfe8" - integrity sha512-9ZTSo+4X4cuLdfOwGBWACMS4/379BulFsMW5kcDxFWW/EYhQ2ieE/CclYMeiOqeIL92rmurdVMHeum0MSH6hbg== +"@abp/toastr@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.3.tgz#a3d2d19963fe96da9566a0f320c7f9911901e69a" + integrity sha512-F1FJPQ0nnu/jZY4XpJFS7uFJgpoEl8aOeFkm6kvshK76ABFLvsWHYW88htW5gXIwOf+G/QClZdx39Os+IQaUJw== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" toastr "^2.1.4" -"@abp/utils@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.2.tgz#03111ac799363db8948cc4b905b7eea437b01fb3" - integrity sha512-ZPrhzl+NiCXxudIv+XozMzwiIWM70AQo8VXl9el8pYiQH0oiEOcT4ny+VmWdMU/94ouW0F3h1cjpYGeJSUWO/w== +"@abp/utils@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.3.tgz#b47f11cb9a0ac963a7f4e5a44360d933e19896fc" + integrity sha512-owTYsROGHfXuHTOFe1uKMAwLbgjzQLKDnmApUy4taYy93rWsu98vFXX6rYJTK7U/X8nZq5y0BtH4covHyfsAxQ== dependencies: just-compare "^1.3.0" diff --git a/modules/cms-kit/angular/package.json b/modules/cms-kit/angular/package.json index 78f260d648..799be1c6ef 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": "~5.3.2", - "@abp/ng.identity": "~5.3.2", - "@abp/ng.setting-management": "~5.3.2", - "@abp/ng.tenant-management": "~5.3.2", - "@abp/ng.theme.basic": "~5.3.2", + "@abp/ng.account": "~5.3.3", + "@abp/ng.identity": "~5.3.3", + "@abp/ng.setting-management": "~5.3.3", + "@abp/ng.tenant-management": "~5.3.3", + "@abp/ng.theme.basic": "~5.3.3", "@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 b9ad9cf2df..d561067392 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": ">=5.3.2", - "@abp/ng.theme.shared": ">=5.3.2" + "@abp/ng.core": ">=5.3.3", + "@abp/ng.theme.shared": ">=5.3.3" }, "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 2f6c4243aa..a96f05fa85 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": "^5.3.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.3" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock index 48e4e1f8ef..97fba3888b 100644 --- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.2.tgz#d0798086ffcad7d0e58c1127cb212012c97f5c9f" - integrity sha512-FJeTr7ePMvBrMN018qWDjhT7xcmNgIBjes6XkE1V7h8Tc6Wyn5aBvXrrqEr1v4FbKm214t1VQy7NudIjMF/UFw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.2.tgz#7ffe5199d7df25b043919592edfbd15c5033acd6" - integrity sha512-8C6QTUqKfi2wCGo+uSZi4tEtPog/E/+F+jBDfT8tFj3eZ8UFZXwYFGUKKt/m1KsVCJ0ItHj1FxKSlpvgadcmtg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.2" - "@abp/bootstrap" "~5.3.2" - "@abp/bootstrap-datepicker" "~5.3.2" - "@abp/datatables.net-bs5" "~5.3.2" - "@abp/font-awesome" "~5.3.2" - "@abp/jquery-form" "~5.3.2" - "@abp/jquery-validation-unobtrusive" "~5.3.2" - "@abp/lodash" "~5.3.2" - "@abp/luxon" "~5.3.2" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.2" - "@abp/select2" "~5.3.2" - "@abp/sweetalert2" "~5.3.2" - "@abp/timeago" "~5.3.2" - "@abp/toastr" "~5.3.2" - -"@abp/aspnetcore.mvc.ui@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.2.tgz#59c8ba140898260c0e1f0612f135af17bd5ae146" - integrity sha512-o12lXWhckLsvYn7xmlOgsUot0WVc/Mljfrf/HIpyzntW1jL0aqGgnG4bNVDlF77fXiPlwK/7WpwHKugqXMPOPQ== +"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.3.tgz#dc6a1bdd583ef5ea0f8a0110753b0869d5f1cb61" + integrity sha512-det7xCtVZK6Dmvr0ENAkYdE+jRW0cVi3BCKZc7c6Hy0VKsKsKlnyz5j/D2rJSAmrap9hyQSWXBJUiho8W92wUQ== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.3" + +"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.3.tgz#65f97d787647e7760bb0c2a5b0f0ff815dc9630a" + integrity sha512-p/Z++QPM7S2lm7obXsZXIarcw0Y88y/Ghy5hyZqdc3uNHL6j8LRlD2qfuRXzl0k9HytXa859UKtSMLSZij1DiA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~5.3.3" + "@abp/bootstrap" "~5.3.3" + "@abp/bootstrap-datepicker" "~5.3.3" + "@abp/datatables.net-bs5" "~5.3.3" + "@abp/font-awesome" "~5.3.3" + "@abp/jquery-form" "~5.3.3" + "@abp/jquery-validation-unobtrusive" "~5.3.3" + "@abp/lodash" "~5.3.3" + "@abp/luxon" "~5.3.3" + "@abp/malihu-custom-scrollbar-plugin" "~5.3.3" + "@abp/select2" "~5.3.3" + "@abp/sweetalert2" "~5.3.3" + "@abp/timeago" "~5.3.3" + "@abp/toastr" "~5.3.3" + +"@abp/aspnetcore.mvc.ui@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.3.tgz#b8beb98bde3e4f0340335014ced7653c7913a621" + integrity sha512-aDQxdfQmlEXIjWGW8wru58imh9cncHAijafvdXlmyfKHM2JfnSSCG/RPMiaoJq/iyDVEggbhx8z4VHODC1eitg== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.2.tgz#065b6d5b4dc484ed4c34c01209d319027e8967ea" - integrity sha512-uA2g1sThLIvGwirbLWLxExw46jnC63jjjs8aO5qSOrGrGfT6XB1OLgnnOPdFacZqPjYneGZ7ULXvOzGh2SsBYQ== +"@abp/bootstrap-datepicker@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.3.tgz#66bf2be128e6389877ed4465149c1933ca182c71" + integrity sha512-w/gPj4BVzVnmwekWVHKPYkwnhZFFH1XtCtw5LeJVM5bSYQBrvVTvvUPdKiiTDV59OYf2sbsA+PscwcTWAG6t/Q== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.2.tgz#7b2663b1d5b0ba8cd079dfb020e26b01fced3118" - integrity sha512-tdbzywiDnbsjNdOY0QBGYD/AtgchGSY7JQZoYczN9Rk4IZr7Axy1Dkw3sP/UBOQrxIOdUGlTEg2bi0MzAmTTig== +"@abp/bootstrap@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.3.tgz#56335b46bd42fba0a522712fbb6591fb6aeb5b68" + integrity sha512-xOtC690pE+QxZYhhQrpTE1rapEjg9BrJg7e0qvrkt4TLMZ4mIbau6/Qlh6x8uuMASCUUuRTLNUzHijxvOJh7Mg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" bootstrap "^5.1.3" -"@abp/core@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.2.tgz#f16026cdfd993c78904a5afe6642b5da8fbc6707" - integrity sha512-kCS8XtL2UyqYavWYGN8SY2A9PKdY5fJxKBEB6GMin4v6LzJB8f7auomLY+gFJs0PjG2rYcyT7sgVijNlOs4ypg== +"@abp/core@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.3.tgz#b03fc281d650d483c9276591f2adb26ea43dcd1e" + integrity sha512-Pp8U+LjchtSxc9lTRaPNQhb+Eh7X2LVERmZvoWyET0y/st28PJZ4eZ4iyGmV00pEmCpadF5aTWVhJcGH32scdQ== dependencies: - "@abp/utils" "~5.3.2" + "@abp/utils" "~5.3.3" -"@abp/datatables.net-bs5@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.2.tgz#bcccfe383ea271f845d25134307c2b407a513c33" - integrity sha512-MTaJW8LKvxOqzWFqmSZP3RcI3ygzB9sC8gH6J3ayILIXuMR+MjWe2OEMYAAQaT/582pME1wHtbp/dthkz6cmRQ== +"@abp/datatables.net-bs5@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.3.tgz#e00304fbe7e6d9d33e1082485f7aa07de48fac0c" + integrity sha512-dkbP3PPkMRJqxravYO7NIVww+MQC3FxHP7mPCg/+PG/LttaNJ5L5hoNcb7BMK2K76hBRMdvlSIzvjycb1w1ooA== dependencies: - "@abp/datatables.net" "~5.3.2" + "@abp/datatables.net" "~5.3.3" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.2.tgz#870959555907cad03dbcb8b3866f2be4aea7a16e" - integrity sha512-7F3dCqBmBzm8h6cM1tl8JG1eras7GaSbDKqJY3CqVCnDgJsk1O966p0VrZjWBxWKJrCoQCDX7+vid9UJlo/1aw== +"@abp/datatables.net@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.3.tgz#6d8eca1034e26708b9adf0d5917aefd5772cbf30" + integrity sha512-1JuXMzHDtrvGRNBYdwEVobiYmhd7VxM432ciARX8hzvSkE0jcgzeTrSlBXfenFMPOIAUJsSOE4YVshtqrY0G4g== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.2.tgz#2ae82288e1c4d664b673d2d7ec264f05fac98d7a" - integrity sha512-ZXNbI+U++Kz73FAEtWCc6KMZYQehqOQCSPEC4AfpYptK6fQ4weTARWzdfWcXluNSPeBtdl3Of+IR4TRjjUEyPA== +"@abp/font-awesome@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.3.tgz#b10a530c9dee28838536746ea2a40342ff2ee3a8" + integrity sha512-c+cvsQ1uolSoyTkM9rZYYM07iiq/Zu8zKOQaDbitQMfPkcfSnC3PG/PTNauSYuwh/SyFfacFXeaDQ5Y/kAGRLw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.2.tgz#0dc63c9b546a4aef4967fad90e6cd010aae976fa" - integrity sha512-S6lWlz32RgZj+ETrg214kOm5++HNiW4ftNRP4DMbwkq3dHvRvHqywdmVLfwaRciAsYpGqu0fl6T4P2WHiPRw2w== +"@abp/jquery-form@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.3.tgz#94234207aa991e098e49e7d1244dc86d289a48e6" + integrity sha512-TY5c4ODfSidYGWqUR+QMNbxasfSufSg9gLY8lTEaJn2Wd2+o3GlauPxlTeNIRCRsxqb8e5+fBJspq1YbtE8vQg== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.2.tgz#91a393a24ab60fce366c65ba23bddf36411da7cb" - integrity sha512-8V99Oaff6P7dQ46klCcl/CmC1OY6MJ43SyUnOltRCVeIodga8wK8rgvJFM5tYZQVmIdNtdxrUziNMw611N+3Uw== +"@abp/jquery-validation-unobtrusive@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.3.tgz#03f776807b60f32d2470c3d3c975ee20f33a993d" + integrity sha512-BNa2oSOfc5CSLW62SLCOinP7ybDDSVjfn0LYdDOdkIpSPnoL/3E1ZmgEzkDCUdTfJ67320kGDtIHCpb+Wbik+Q== dependencies: - "@abp/jquery-validation" "~5.3.2" + "@abp/jquery-validation" "~5.3.3" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.2.tgz#18a0f7ca797adebe9393732a62251760f34f66f0" - integrity sha512-uokx6CKtHlu8WCe3YogPi+24KG15hOi7vvtiwvwZ2dV9rJpbAnDYnq7NLwjh1JFlRGsPp8vpLi9m9zilKf1CDg== +"@abp/jquery-validation@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.3.tgz#a0544428b94966f35d3aebb40c354d3f4485137d" + integrity sha512-GFhrS4pVmbQRI0eiW2aBYmRTB0rR2s3Wj4NIVB69ZHwvy+uADA3M/oMs8Q4wuT+gmPu2GCjPNCc5RPsC173VPA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.2.tgz#add343f7a69a2bad7f7195a616ea4fd75abcb223" - integrity sha512-s8yfkAY1xRRc/WHkrC0mDJAW3j28b/w0EMIKv+IKi6xOExqZ9/PxWDC7HIdHt3lTvHf3I9jHumypZwNyC4PP1A== +"@abp/jquery@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.3.tgz#be70aa671129fac192b8f858a973e65018960cbd" + integrity sha512-sUy0aquZPq+HyxChYJMTjUZxaTo5/Aav5JcbMq1RczIFidjOrFHthWnYZveDVSKryaCfX3tXutag1sPakUOTtg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" jquery "~3.6.0" -"@abp/lodash@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.2.tgz#b3bfc70be099aae436badb4840a1f9715af5db36" - integrity sha512-IkeNEy8uiONy3VoHS7FVIL/bQVzTD1prmRMJ78dYNP8Qn317pG5/NEOgJXbka0zqR/mb2gXDg13kwlffsJWWlw== +"@abp/lodash@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.3.tgz#365684a338ab5d68adffa93207d0035eaa494ef9" + integrity sha512-Lqb2DkmKBPBHNbUd1QeATv8G/qUPamd06bKbe7xHesX3DZtlIwTmimwTpV4tqmJqOLKB67uUtapPYCfKyxs1RQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" lodash "^4.17.21" -"@abp/luxon@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.2.tgz#4d6039505d13edb30ef8b2f00bca69639cd2afd2" - integrity sha512-uxym895NuCsi5KE7JwiL2d+MnJMXZIu8xCutb0NtT89BvfjeZnAv8FOr4NjaYg+pmxTyj1i9RmBzfYsz0yvmkQ== +"@abp/luxon@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.3.tgz#97a60ae64e865d2b1c04107302d4ec50d4e09217" + integrity sha512-/7Lb463HREBFlt17tUFinTpYxfbZ8UIi1+d7Fqp8spJv78qCxvpWmD4iuJJJdCExO00ztZWY9GkCDPrAbfP/dA== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.2.tgz#99188d4b6497384720cf7168c909d32a39eff8a4" - integrity sha512-d2UcBQt4w7VqZdJjdb+JJpp9mFli7WbK7SrRTUeIINdKo3x4nrABbuKUgMBNxkroDVi1ErI0I4gwsVAGrMUPFw== +"@abp/malihu-custom-scrollbar-plugin@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.3.tgz#96be03f79be929b1a2cb67acb38e9d6638f04f15" + integrity sha512-hr5qmcVl+Wr6sIS10QerWRTfFvhmhq9e48G9Hx5oQZFjrIkfJRlxla0TYViHR2tRYCeDQGb4gYmN4Fc71mdcPg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.2.tgz#b39ddab8f0be539a880bdff7bc3307d9596a545d" - integrity sha512-JAf8LceHL5SUDBYRZ2BTpfIBRc4xyhE+9uo4ZqXXstLpJUUoaW2WlTSCNlBakSlR9k4Fprk9RjqVcrpNuWN+ew== +"@abp/select2@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.3.tgz#bdb8de1fcc5c9964233fdf1d4b88f7b90099f293" + integrity sha512-yk4CDpgksM5pAXMgFnULlgDovBk0oeXRhAA6lpt0TizzJ353WkpcASUblHbWOePzXbJFBBB2cj3XBD9vdWx7Ig== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.2.tgz#1ddb2caf2e82b6f0faa3420beda8a491c51fb1df" - integrity sha512-JSV33EVAK7y1VaYQf9HBLFjVkfUHvb3aeIta/xu0Wbw17JyJHrjlk/H0Z4ihkjPcCU2CDqVJCUUzhjdFFjHNag== +"@abp/sweetalert2@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.3.tgz#54a2d45ddbdaa2f7a4485aa5731f2fec65a9c771" + integrity sha512-Lbw6S+xTNMtHeFaMJNbYTMtqznDwRtlN4+f+hRGWbqNIpHuMfTi1jUgdeZTYRjbhY+RTduUJrs8lvvPMKWgrTw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.2.tgz#cb85f15a06cb85f82cdfa0c1454b20258014f613" - integrity sha512-jjUI+R4vRe/k9I2In5tp9PNKsf1quldVZA16vKRfxkF8TrN05RBF9ks5H+zlbe//okVCVl1Gz5MVt3XP7arEig== +"@abp/timeago@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.3.tgz#6e13a178d67e635ebe65d01db220d09f1673bafa" + integrity sha512-mBwaioPVnIeMXP6tDG24NZaTCAGvk8cMah8ems3OLWNK+tsPU4Jy8BVHTSmd/7rA69EL0REuSw2GmiCvaCL+RQ== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" timeago "^1.6.7" -"@abp/toastr@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.2.tgz#f714ff89267d5e375fa2c0c8bef40f3eeacedfe8" - integrity sha512-9ZTSo+4X4cuLdfOwGBWACMS4/379BulFsMW5kcDxFWW/EYhQ2ieE/CclYMeiOqeIL92rmurdVMHeum0MSH6hbg== +"@abp/toastr@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.3.tgz#a3d2d19963fe96da9566a0f320c7f9911901e69a" + integrity sha512-F1FJPQ0nnu/jZY4XpJFS7uFJgpoEl8aOeFkm6kvshK76ABFLvsWHYW88htW5gXIwOf+G/QClZdx39Os+IQaUJw== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" toastr "^2.1.4" -"@abp/utils@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.2.tgz#03111ac799363db8948cc4b905b7eea437b01fb3" - integrity sha512-ZPrhzl+NiCXxudIv+XozMzwiIWM70AQo8VXl9el8pYiQH0oiEOcT4ny+VmWdMU/94ouW0F3h1cjpYGeJSUWO/w== +"@abp/utils@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.3.tgz#b47f11cb9a0ac963a7f4e5a44360d933e19896fc" + integrity sha512-owTYsROGHfXuHTOFe1uKMAwLbgjzQLKDnmApUy4taYy93rWsu98vFXX6rYJTK7U/X8nZq5y0BtH4covHyfsAxQ== dependencies: just-compare "^1.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 2e9daa28f6..534c364bfe 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": "^5.3.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.3" } } 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 240068f4af..e00d374a77 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.2.tgz#d0798086ffcad7d0e58c1127cb212012c97f5c9f" - integrity sha512-FJeTr7ePMvBrMN018qWDjhT7xcmNgIBjes6XkE1V7h8Tc6Wyn5aBvXrrqEr1v4FbKm214t1VQy7NudIjMF/UFw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.2.tgz#7ffe5199d7df25b043919592edfbd15c5033acd6" - integrity sha512-8C6QTUqKfi2wCGo+uSZi4tEtPog/E/+F+jBDfT8tFj3eZ8UFZXwYFGUKKt/m1KsVCJ0ItHj1FxKSlpvgadcmtg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.2" - "@abp/bootstrap" "~5.3.2" - "@abp/bootstrap-datepicker" "~5.3.2" - "@abp/datatables.net-bs5" "~5.3.2" - "@abp/font-awesome" "~5.3.2" - "@abp/jquery-form" "~5.3.2" - "@abp/jquery-validation-unobtrusive" "~5.3.2" - "@abp/lodash" "~5.3.2" - "@abp/luxon" "~5.3.2" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.2" - "@abp/select2" "~5.3.2" - "@abp/sweetalert2" "~5.3.2" - "@abp/timeago" "~5.3.2" - "@abp/toastr" "~5.3.2" - -"@abp/aspnetcore.mvc.ui@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.2.tgz#59c8ba140898260c0e1f0612f135af17bd5ae146" - integrity sha512-o12lXWhckLsvYn7xmlOgsUot0WVc/Mljfrf/HIpyzntW1jL0aqGgnG4bNVDlF77fXiPlwK/7WpwHKugqXMPOPQ== +"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.3.tgz#dc6a1bdd583ef5ea0f8a0110753b0869d5f1cb61" + integrity sha512-det7xCtVZK6Dmvr0ENAkYdE+jRW0cVi3BCKZc7c6Hy0VKsKsKlnyz5j/D2rJSAmrap9hyQSWXBJUiho8W92wUQ== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.3" + +"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.3.tgz#65f97d787647e7760bb0c2a5b0f0ff815dc9630a" + integrity sha512-p/Z++QPM7S2lm7obXsZXIarcw0Y88y/Ghy5hyZqdc3uNHL6j8LRlD2qfuRXzl0k9HytXa859UKtSMLSZij1DiA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~5.3.3" + "@abp/bootstrap" "~5.3.3" + "@abp/bootstrap-datepicker" "~5.3.3" + "@abp/datatables.net-bs5" "~5.3.3" + "@abp/font-awesome" "~5.3.3" + "@abp/jquery-form" "~5.3.3" + "@abp/jquery-validation-unobtrusive" "~5.3.3" + "@abp/lodash" "~5.3.3" + "@abp/luxon" "~5.3.3" + "@abp/malihu-custom-scrollbar-plugin" "~5.3.3" + "@abp/select2" "~5.3.3" + "@abp/sweetalert2" "~5.3.3" + "@abp/timeago" "~5.3.3" + "@abp/toastr" "~5.3.3" + +"@abp/aspnetcore.mvc.ui@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.3.tgz#b8beb98bde3e4f0340335014ced7653c7913a621" + integrity sha512-aDQxdfQmlEXIjWGW8wru58imh9cncHAijafvdXlmyfKHM2JfnSSCG/RPMiaoJq/iyDVEggbhx8z4VHODC1eitg== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.2.tgz#065b6d5b4dc484ed4c34c01209d319027e8967ea" - integrity sha512-uA2g1sThLIvGwirbLWLxExw46jnC63jjjs8aO5qSOrGrGfT6XB1OLgnnOPdFacZqPjYneGZ7ULXvOzGh2SsBYQ== +"@abp/bootstrap-datepicker@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.3.tgz#66bf2be128e6389877ed4465149c1933ca182c71" + integrity sha512-w/gPj4BVzVnmwekWVHKPYkwnhZFFH1XtCtw5LeJVM5bSYQBrvVTvvUPdKiiTDV59OYf2sbsA+PscwcTWAG6t/Q== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.2.tgz#7b2663b1d5b0ba8cd079dfb020e26b01fced3118" - integrity sha512-tdbzywiDnbsjNdOY0QBGYD/AtgchGSY7JQZoYczN9Rk4IZr7Axy1Dkw3sP/UBOQrxIOdUGlTEg2bi0MzAmTTig== +"@abp/bootstrap@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.3.tgz#56335b46bd42fba0a522712fbb6591fb6aeb5b68" + integrity sha512-xOtC690pE+QxZYhhQrpTE1rapEjg9BrJg7e0qvrkt4TLMZ4mIbau6/Qlh6x8uuMASCUUuRTLNUzHijxvOJh7Mg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" bootstrap "^5.1.3" -"@abp/core@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.2.tgz#f16026cdfd993c78904a5afe6642b5da8fbc6707" - integrity sha512-kCS8XtL2UyqYavWYGN8SY2A9PKdY5fJxKBEB6GMin4v6LzJB8f7auomLY+gFJs0PjG2rYcyT7sgVijNlOs4ypg== +"@abp/core@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.3.tgz#b03fc281d650d483c9276591f2adb26ea43dcd1e" + integrity sha512-Pp8U+LjchtSxc9lTRaPNQhb+Eh7X2LVERmZvoWyET0y/st28PJZ4eZ4iyGmV00pEmCpadF5aTWVhJcGH32scdQ== dependencies: - "@abp/utils" "~5.3.2" + "@abp/utils" "~5.3.3" -"@abp/datatables.net-bs5@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.2.tgz#bcccfe383ea271f845d25134307c2b407a513c33" - integrity sha512-MTaJW8LKvxOqzWFqmSZP3RcI3ygzB9sC8gH6J3ayILIXuMR+MjWe2OEMYAAQaT/582pME1wHtbp/dthkz6cmRQ== +"@abp/datatables.net-bs5@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.3.tgz#e00304fbe7e6d9d33e1082485f7aa07de48fac0c" + integrity sha512-dkbP3PPkMRJqxravYO7NIVww+MQC3FxHP7mPCg/+PG/LttaNJ5L5hoNcb7BMK2K76hBRMdvlSIzvjycb1w1ooA== dependencies: - "@abp/datatables.net" "~5.3.2" + "@abp/datatables.net" "~5.3.3" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.2.tgz#870959555907cad03dbcb8b3866f2be4aea7a16e" - integrity sha512-7F3dCqBmBzm8h6cM1tl8JG1eras7GaSbDKqJY3CqVCnDgJsk1O966p0VrZjWBxWKJrCoQCDX7+vid9UJlo/1aw== +"@abp/datatables.net@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.3.tgz#6d8eca1034e26708b9adf0d5917aefd5772cbf30" + integrity sha512-1JuXMzHDtrvGRNBYdwEVobiYmhd7VxM432ciARX8hzvSkE0jcgzeTrSlBXfenFMPOIAUJsSOE4YVshtqrY0G4g== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.2.tgz#2ae82288e1c4d664b673d2d7ec264f05fac98d7a" - integrity sha512-ZXNbI+U++Kz73FAEtWCc6KMZYQehqOQCSPEC4AfpYptK6fQ4weTARWzdfWcXluNSPeBtdl3Of+IR4TRjjUEyPA== +"@abp/font-awesome@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.3.tgz#b10a530c9dee28838536746ea2a40342ff2ee3a8" + integrity sha512-c+cvsQ1uolSoyTkM9rZYYM07iiq/Zu8zKOQaDbitQMfPkcfSnC3PG/PTNauSYuwh/SyFfacFXeaDQ5Y/kAGRLw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.2.tgz#0dc63c9b546a4aef4967fad90e6cd010aae976fa" - integrity sha512-S6lWlz32RgZj+ETrg214kOm5++HNiW4ftNRP4DMbwkq3dHvRvHqywdmVLfwaRciAsYpGqu0fl6T4P2WHiPRw2w== +"@abp/jquery-form@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.3.tgz#94234207aa991e098e49e7d1244dc86d289a48e6" + integrity sha512-TY5c4ODfSidYGWqUR+QMNbxasfSufSg9gLY8lTEaJn2Wd2+o3GlauPxlTeNIRCRsxqb8e5+fBJspq1YbtE8vQg== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.2.tgz#91a393a24ab60fce366c65ba23bddf36411da7cb" - integrity sha512-8V99Oaff6P7dQ46klCcl/CmC1OY6MJ43SyUnOltRCVeIodga8wK8rgvJFM5tYZQVmIdNtdxrUziNMw611N+3Uw== +"@abp/jquery-validation-unobtrusive@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.3.tgz#03f776807b60f32d2470c3d3c975ee20f33a993d" + integrity sha512-BNa2oSOfc5CSLW62SLCOinP7ybDDSVjfn0LYdDOdkIpSPnoL/3E1ZmgEzkDCUdTfJ67320kGDtIHCpb+Wbik+Q== dependencies: - "@abp/jquery-validation" "~5.3.2" + "@abp/jquery-validation" "~5.3.3" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.2.tgz#18a0f7ca797adebe9393732a62251760f34f66f0" - integrity sha512-uokx6CKtHlu8WCe3YogPi+24KG15hOi7vvtiwvwZ2dV9rJpbAnDYnq7NLwjh1JFlRGsPp8vpLi9m9zilKf1CDg== +"@abp/jquery-validation@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.3.tgz#a0544428b94966f35d3aebb40c354d3f4485137d" + integrity sha512-GFhrS4pVmbQRI0eiW2aBYmRTB0rR2s3Wj4NIVB69ZHwvy+uADA3M/oMs8Q4wuT+gmPu2GCjPNCc5RPsC173VPA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.2.tgz#add343f7a69a2bad7f7195a616ea4fd75abcb223" - integrity sha512-s8yfkAY1xRRc/WHkrC0mDJAW3j28b/w0EMIKv+IKi6xOExqZ9/PxWDC7HIdHt3lTvHf3I9jHumypZwNyC4PP1A== +"@abp/jquery@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.3.tgz#be70aa671129fac192b8f858a973e65018960cbd" + integrity sha512-sUy0aquZPq+HyxChYJMTjUZxaTo5/Aav5JcbMq1RczIFidjOrFHthWnYZveDVSKryaCfX3tXutag1sPakUOTtg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" jquery "~3.6.0" -"@abp/lodash@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.2.tgz#b3bfc70be099aae436badb4840a1f9715af5db36" - integrity sha512-IkeNEy8uiONy3VoHS7FVIL/bQVzTD1prmRMJ78dYNP8Qn317pG5/NEOgJXbka0zqR/mb2gXDg13kwlffsJWWlw== +"@abp/lodash@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.3.tgz#365684a338ab5d68adffa93207d0035eaa494ef9" + integrity sha512-Lqb2DkmKBPBHNbUd1QeATv8G/qUPamd06bKbe7xHesX3DZtlIwTmimwTpV4tqmJqOLKB67uUtapPYCfKyxs1RQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" lodash "^4.17.21" -"@abp/luxon@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.2.tgz#4d6039505d13edb30ef8b2f00bca69639cd2afd2" - integrity sha512-uxym895NuCsi5KE7JwiL2d+MnJMXZIu8xCutb0NtT89BvfjeZnAv8FOr4NjaYg+pmxTyj1i9RmBzfYsz0yvmkQ== +"@abp/luxon@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.3.tgz#97a60ae64e865d2b1c04107302d4ec50d4e09217" + integrity sha512-/7Lb463HREBFlt17tUFinTpYxfbZ8UIi1+d7Fqp8spJv78qCxvpWmD4iuJJJdCExO00ztZWY9GkCDPrAbfP/dA== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.2.tgz#99188d4b6497384720cf7168c909d32a39eff8a4" - integrity sha512-d2UcBQt4w7VqZdJjdb+JJpp9mFli7WbK7SrRTUeIINdKo3x4nrABbuKUgMBNxkroDVi1ErI0I4gwsVAGrMUPFw== +"@abp/malihu-custom-scrollbar-plugin@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.3.tgz#96be03f79be929b1a2cb67acb38e9d6638f04f15" + integrity sha512-hr5qmcVl+Wr6sIS10QerWRTfFvhmhq9e48G9Hx5oQZFjrIkfJRlxla0TYViHR2tRYCeDQGb4gYmN4Fc71mdcPg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.2.tgz#b39ddab8f0be539a880bdff7bc3307d9596a545d" - integrity sha512-JAf8LceHL5SUDBYRZ2BTpfIBRc4xyhE+9uo4ZqXXstLpJUUoaW2WlTSCNlBakSlR9k4Fprk9RjqVcrpNuWN+ew== +"@abp/select2@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.3.tgz#bdb8de1fcc5c9964233fdf1d4b88f7b90099f293" + integrity sha512-yk4CDpgksM5pAXMgFnULlgDovBk0oeXRhAA6lpt0TizzJ353WkpcASUblHbWOePzXbJFBBB2cj3XBD9vdWx7Ig== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.2.tgz#1ddb2caf2e82b6f0faa3420beda8a491c51fb1df" - integrity sha512-JSV33EVAK7y1VaYQf9HBLFjVkfUHvb3aeIta/xu0Wbw17JyJHrjlk/H0Z4ihkjPcCU2CDqVJCUUzhjdFFjHNag== +"@abp/sweetalert2@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.3.tgz#54a2d45ddbdaa2f7a4485aa5731f2fec65a9c771" + integrity sha512-Lbw6S+xTNMtHeFaMJNbYTMtqznDwRtlN4+f+hRGWbqNIpHuMfTi1jUgdeZTYRjbhY+RTduUJrs8lvvPMKWgrTw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.2.tgz#cb85f15a06cb85f82cdfa0c1454b20258014f613" - integrity sha512-jjUI+R4vRe/k9I2In5tp9PNKsf1quldVZA16vKRfxkF8TrN05RBF9ks5H+zlbe//okVCVl1Gz5MVt3XP7arEig== +"@abp/timeago@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.3.tgz#6e13a178d67e635ebe65d01db220d09f1673bafa" + integrity sha512-mBwaioPVnIeMXP6tDG24NZaTCAGvk8cMah8ems3OLWNK+tsPU4Jy8BVHTSmd/7rA69EL0REuSw2GmiCvaCL+RQ== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" timeago "^1.6.7" -"@abp/toastr@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.2.tgz#f714ff89267d5e375fa2c0c8bef40f3eeacedfe8" - integrity sha512-9ZTSo+4X4cuLdfOwGBWACMS4/379BulFsMW5kcDxFWW/EYhQ2ieE/CclYMeiOqeIL92rmurdVMHeum0MSH6hbg== +"@abp/toastr@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.3.tgz#a3d2d19963fe96da9566a0f320c7f9911901e69a" + integrity sha512-F1FJPQ0nnu/jZY4XpJFS7uFJgpoEl8aOeFkm6kvshK76ABFLvsWHYW88htW5gXIwOf+G/QClZdx39Os+IQaUJw== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" toastr "^2.1.4" -"@abp/utils@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.2.tgz#03111ac799363db8948cc4b905b7eea437b01fb3" - integrity sha512-ZPrhzl+NiCXxudIv+XozMzwiIWM70AQo8VXl9el8pYiQH0oiEOcT4ny+VmWdMU/94ouW0F3h1cjpYGeJSUWO/w== +"@abp/utils@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.3.tgz#b47f11cb9a0ac963a7f4e5a44360d933e19896fc" + integrity sha512-owTYsROGHfXuHTOFe1uKMAwLbgjzQLKDnmApUy4taYy93rWsu98vFXX6rYJTK7U/X8nZq5y0BtH4covHyfsAxQ== dependencies: just-compare "^1.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 55de8f1d07..1abce64782 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": "^5.3.2", - "@abp/cms-kit": "5.3.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.3", + "@abp/cms-kit": "5.3.3" } } 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 43603acc93..9bcabaee28 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.2.tgz#d0798086ffcad7d0e58c1127cb212012c97f5c9f" - integrity sha512-FJeTr7ePMvBrMN018qWDjhT7xcmNgIBjes6XkE1V7h8Tc6Wyn5aBvXrrqEr1v4FbKm214t1VQy7NudIjMF/UFw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.2.tgz#7ffe5199d7df25b043919592edfbd15c5033acd6" - integrity sha512-8C6QTUqKfi2wCGo+uSZi4tEtPog/E/+F+jBDfT8tFj3eZ8UFZXwYFGUKKt/m1KsVCJ0ItHj1FxKSlpvgadcmtg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.2" - "@abp/bootstrap" "~5.3.2" - "@abp/bootstrap-datepicker" "~5.3.2" - "@abp/datatables.net-bs5" "~5.3.2" - "@abp/font-awesome" "~5.3.2" - "@abp/jquery-form" "~5.3.2" - "@abp/jquery-validation-unobtrusive" "~5.3.2" - "@abp/lodash" "~5.3.2" - "@abp/luxon" "~5.3.2" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.2" - "@abp/select2" "~5.3.2" - "@abp/sweetalert2" "~5.3.2" - "@abp/timeago" "~5.3.2" - "@abp/toastr" "~5.3.2" - -"@abp/aspnetcore.mvc.ui@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.2.tgz#59c8ba140898260c0e1f0612f135af17bd5ae146" - integrity sha512-o12lXWhckLsvYn7xmlOgsUot0WVc/Mljfrf/HIpyzntW1jL0aqGgnG4bNVDlF77fXiPlwK/7WpwHKugqXMPOPQ== +"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.3.tgz#dc6a1bdd583ef5ea0f8a0110753b0869d5f1cb61" + integrity sha512-det7xCtVZK6Dmvr0ENAkYdE+jRW0cVi3BCKZc7c6Hy0VKsKsKlnyz5j/D2rJSAmrap9hyQSWXBJUiho8W92wUQ== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.3" + +"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.3.tgz#65f97d787647e7760bb0c2a5b0f0ff815dc9630a" + integrity sha512-p/Z++QPM7S2lm7obXsZXIarcw0Y88y/Ghy5hyZqdc3uNHL6j8LRlD2qfuRXzl0k9HytXa859UKtSMLSZij1DiA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~5.3.3" + "@abp/bootstrap" "~5.3.3" + "@abp/bootstrap-datepicker" "~5.3.3" + "@abp/datatables.net-bs5" "~5.3.3" + "@abp/font-awesome" "~5.3.3" + "@abp/jquery-form" "~5.3.3" + "@abp/jquery-validation-unobtrusive" "~5.3.3" + "@abp/lodash" "~5.3.3" + "@abp/luxon" "~5.3.3" + "@abp/malihu-custom-scrollbar-plugin" "~5.3.3" + "@abp/select2" "~5.3.3" + "@abp/sweetalert2" "~5.3.3" + "@abp/timeago" "~5.3.3" + "@abp/toastr" "~5.3.3" + +"@abp/aspnetcore.mvc.ui@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.3.tgz#b8beb98bde3e4f0340335014ced7653c7913a621" + integrity sha512-aDQxdfQmlEXIjWGW8wru58imh9cncHAijafvdXlmyfKHM2JfnSSCG/RPMiaoJq/iyDVEggbhx8z4VHODC1eitg== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,243 +41,243 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.2.tgz#065b6d5b4dc484ed4c34c01209d319027e8967ea" - integrity sha512-uA2g1sThLIvGwirbLWLxExw46jnC63jjjs8aO5qSOrGrGfT6XB1OLgnnOPdFacZqPjYneGZ7ULXvOzGh2SsBYQ== +"@abp/bootstrap-datepicker@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.3.tgz#66bf2be128e6389877ed4465149c1933ca182c71" + integrity sha512-w/gPj4BVzVnmwekWVHKPYkwnhZFFH1XtCtw5LeJVM5bSYQBrvVTvvUPdKiiTDV59OYf2sbsA+PscwcTWAG6t/Q== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.2.tgz#7b2663b1d5b0ba8cd079dfb020e26b01fced3118" - integrity sha512-tdbzywiDnbsjNdOY0QBGYD/AtgchGSY7JQZoYczN9Rk4IZr7Axy1Dkw3sP/UBOQrxIOdUGlTEg2bi0MzAmTTig== +"@abp/bootstrap@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.3.tgz#56335b46bd42fba0a522712fbb6591fb6aeb5b68" + integrity sha512-xOtC690pE+QxZYhhQrpTE1rapEjg9BrJg7e0qvrkt4TLMZ4mIbau6/Qlh6x8uuMASCUUuRTLNUzHijxvOJh7Mg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" bootstrap "^5.1.3" -"@abp/clipboard@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-5.3.2.tgz#f1c00a66b3bbe46459b8f022fd54c098a9504673" - integrity sha512-e9TvKtBziGCmWw+lysqvd5CxqaIT2+L5anAx4xujiZR6EnBApLLqprlJyH7yAsxI4LJcKdBA+oj65xBtjVOm3w== +"@abp/clipboard@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-5.3.3.tgz#62c3c12f1ff503091924f672f71a50e2e5d0b47c" + integrity sha512-FRJPM9/P3WPuK4Id1KVfmpkOB3MrlrYp/beNqZtjqQuG8WDjVgnHrDnsPYfzeLdK5n6bEvtGWwtHwiaBOXhWZg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" clipboard "^2.0.8" -"@abp/cms-kit.admin@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/cms-kit.admin/-/cms-kit.admin-5.3.2.tgz#ca34fca45923e57328dfa728cf382d9cca1843c1" - integrity sha512-VnYM9udFFMsu2Myy6qVg3f3oLVTalguIzMe+EiPIJVbjmKBBTSpXzsgvpPYHiuCobO/V7Fd3d/fxrOOM2g1KNA== +"@abp/cms-kit.admin@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/cms-kit.admin/-/cms-kit.admin-5.3.3.tgz#c5890565c470d12293d319565600f02440b8ef1f" + integrity sha512-Z54dxAbDpdDWq+ZOkmlrG42L5nfurca5O6gZy0cutHg68f2KjA7Pvu93FACtCOUz9Ou5t9zLL4SWBf7uKQj6qw== dependencies: - "@abp/codemirror" "~5.3.2" - "@abp/jstree" "~5.3.2" - "@abp/slugify" "~5.3.2" - "@abp/tui-editor" "~5.3.2" - "@abp/uppy" "~5.3.2" + "@abp/codemirror" "~5.3.3" + "@abp/jstree" "~5.3.3" + "@abp/slugify" "~5.3.3" + "@abp/tui-editor" "~5.3.3" + "@abp/uppy" "~5.3.3" -"@abp/cms-kit.public@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/cms-kit.public/-/cms-kit.public-5.3.2.tgz#edad9fa5433b95c5b72483c9600ecc072ed33b52" - integrity sha512-+WOr0hv9XEZSo/6hTph7RVT6OibbhrtsWqpI2Pt9Ug3atUcPKC2GeqhPqn2UevHzBwOzPiaZgxauB9ZADgUG8A== +"@abp/cms-kit.public@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/cms-kit.public/-/cms-kit.public-5.3.3.tgz#031cb6f6067c0da2d77d865ad9f85b3ca5447777" + integrity sha512-oA0E3wE0TiLYIyp/CdpoitrYvw5MxBZ8MMjEzikuLadwOqlnWYu70UpvOAAcwwFLPSo9j85IQ1AKgCA43sE1CA== dependencies: - "@abp/highlight.js" "~5.3.2" - "@abp/star-rating-svg" "~5.3.2" + "@abp/highlight.js" "~5.3.3" + "@abp/star-rating-svg" "~5.3.3" -"@abp/cms-kit@5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-5.3.2.tgz#e51db314d4c81e465a84a3a9fa1349c792af7b5e" - integrity sha512-EIt4gbtYE2gmg95/aiVjC33/egAR3G0vmazH8mCYKqoeTaMa9Uih4Rs/DoSRhkbg8jntkDMdRoE7FOiyAAvIxA== +"@abp/cms-kit@5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-5.3.3.tgz#1117e61d0318a980e0e993cd14e060bd268ac76f" + integrity sha512-fD2CU0TGiAZqs76h3ebE27F/OkHvktmCFA0HwrzO3GwXuwC/fRVS1/HDn2q6Zop4wzknVpIrbe9jfT29P9+HTQ== dependencies: - "@abp/cms-kit.admin" "~5.3.2" - "@abp/cms-kit.public" "~5.3.2" + "@abp/cms-kit.admin" "~5.3.3" + "@abp/cms-kit.public" "~5.3.3" -"@abp/codemirror@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-5.3.2.tgz#0d606585574159d9a271df2173345b21ca3502b4" - integrity sha512-0Li5nPhgE+anfg59D6C1PrCa9cURgV2RWZjrbVzh2PfPzImxWqWSBpKBemMj6o9ymYNTRqJDjmYxi/dSX42AjQ== +"@abp/codemirror@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-5.3.3.tgz#ca79c3d791327f2a73f332099e3ea03ef008f17c" + integrity sha512-doywv1NE3NvsvMBG8RTdxGdFqyDeRIc0PaaHw9+vI8nJ2We/lNkDldpA2CVInrglzc6KKiPiYNSKtCcbw6jwZQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" codemirror "^5.65.1" -"@abp/core@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.2.tgz#f16026cdfd993c78904a5afe6642b5da8fbc6707" - integrity sha512-kCS8XtL2UyqYavWYGN8SY2A9PKdY5fJxKBEB6GMin4v6LzJB8f7auomLY+gFJs0PjG2rYcyT7sgVijNlOs4ypg== +"@abp/core@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.3.tgz#b03fc281d650d483c9276591f2adb26ea43dcd1e" + integrity sha512-Pp8U+LjchtSxc9lTRaPNQhb+Eh7X2LVERmZvoWyET0y/st28PJZ4eZ4iyGmV00pEmCpadF5aTWVhJcGH32scdQ== dependencies: - "@abp/utils" "~5.3.2" + "@abp/utils" "~5.3.3" -"@abp/datatables.net-bs5@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.2.tgz#bcccfe383ea271f845d25134307c2b407a513c33" - integrity sha512-MTaJW8LKvxOqzWFqmSZP3RcI3ygzB9sC8gH6J3ayILIXuMR+MjWe2OEMYAAQaT/582pME1wHtbp/dthkz6cmRQ== +"@abp/datatables.net-bs5@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.3.tgz#e00304fbe7e6d9d33e1082485f7aa07de48fac0c" + integrity sha512-dkbP3PPkMRJqxravYO7NIVww+MQC3FxHP7mPCg/+PG/LttaNJ5L5hoNcb7BMK2K76hBRMdvlSIzvjycb1w1ooA== dependencies: - "@abp/datatables.net" "~5.3.2" + "@abp/datatables.net" "~5.3.3" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.2.tgz#870959555907cad03dbcb8b3866f2be4aea7a16e" - integrity sha512-7F3dCqBmBzm8h6cM1tl8JG1eras7GaSbDKqJY3CqVCnDgJsk1O966p0VrZjWBxWKJrCoQCDX7+vid9UJlo/1aw== +"@abp/datatables.net@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.3.tgz#6d8eca1034e26708b9adf0d5917aefd5772cbf30" + integrity sha512-1JuXMzHDtrvGRNBYdwEVobiYmhd7VxM432ciARX8hzvSkE0jcgzeTrSlBXfenFMPOIAUJsSOE4YVshtqrY0G4g== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.2.tgz#2ae82288e1c4d664b673d2d7ec264f05fac98d7a" - integrity sha512-ZXNbI+U++Kz73FAEtWCc6KMZYQehqOQCSPEC4AfpYptK6fQ4weTARWzdfWcXluNSPeBtdl3Of+IR4TRjjUEyPA== +"@abp/font-awesome@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.3.tgz#b10a530c9dee28838536746ea2a40342ff2ee3a8" + integrity sha512-c+cvsQ1uolSoyTkM9rZYYM07iiq/Zu8zKOQaDbitQMfPkcfSnC3PG/PTNauSYuwh/SyFfacFXeaDQ5Y/kAGRLw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/highlight.js@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-5.3.2.tgz#c8f2b9e39da04e8e64c3882f33fd17260ff6e99b" - integrity sha512-qKg4xYwM81JdQaD0YuNTjMTNVAIxg2hRpkHfpL5lmY01bVV2Lui6Ziz0Fii1YVc6Qw8PxaJEWqNfEvEY0F5d2A== +"@abp/highlight.js@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-5.3.3.tgz#1875fcbb2ea96b7234b5a2c6f490b6583d6bf1c9" + integrity sha512-/X18KAojiGsyuBeAxihNJ3QyfiTkcHAqbFbJRGcNRiFVJCwPJcWRksFSOG5lMhLr/kfa7esRAlKxsZhcbYm5UA== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" "@highlightjs/cdn-assets" "~11.4.0" -"@abp/jquery-form@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.2.tgz#0dc63c9b546a4aef4967fad90e6cd010aae976fa" - integrity sha512-S6lWlz32RgZj+ETrg214kOm5++HNiW4ftNRP4DMbwkq3dHvRvHqywdmVLfwaRciAsYpGqu0fl6T4P2WHiPRw2w== +"@abp/jquery-form@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.3.tgz#94234207aa991e098e49e7d1244dc86d289a48e6" + integrity sha512-TY5c4ODfSidYGWqUR+QMNbxasfSufSg9gLY8lTEaJn2Wd2+o3GlauPxlTeNIRCRsxqb8e5+fBJspq1YbtE8vQg== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.2.tgz#91a393a24ab60fce366c65ba23bddf36411da7cb" - integrity sha512-8V99Oaff6P7dQ46klCcl/CmC1OY6MJ43SyUnOltRCVeIodga8wK8rgvJFM5tYZQVmIdNtdxrUziNMw611N+3Uw== +"@abp/jquery-validation-unobtrusive@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.3.tgz#03f776807b60f32d2470c3d3c975ee20f33a993d" + integrity sha512-BNa2oSOfc5CSLW62SLCOinP7ybDDSVjfn0LYdDOdkIpSPnoL/3E1ZmgEzkDCUdTfJ67320kGDtIHCpb+Wbik+Q== dependencies: - "@abp/jquery-validation" "~5.3.2" + "@abp/jquery-validation" "~5.3.3" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.2.tgz#18a0f7ca797adebe9393732a62251760f34f66f0" - integrity sha512-uokx6CKtHlu8WCe3YogPi+24KG15hOi7vvtiwvwZ2dV9rJpbAnDYnq7NLwjh1JFlRGsPp8vpLi9m9zilKf1CDg== +"@abp/jquery-validation@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.3.tgz#a0544428b94966f35d3aebb40c354d3f4485137d" + integrity sha512-GFhrS4pVmbQRI0eiW2aBYmRTB0rR2s3Wj4NIVB69ZHwvy+uADA3M/oMs8Q4wuT+gmPu2GCjPNCc5RPsC173VPA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.2.tgz#add343f7a69a2bad7f7195a616ea4fd75abcb223" - integrity sha512-s8yfkAY1xRRc/WHkrC0mDJAW3j28b/w0EMIKv+IKi6xOExqZ9/PxWDC7HIdHt3lTvHf3I9jHumypZwNyC4PP1A== +"@abp/jquery@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.3.tgz#be70aa671129fac192b8f858a973e65018960cbd" + integrity sha512-sUy0aquZPq+HyxChYJMTjUZxaTo5/Aav5JcbMq1RczIFidjOrFHthWnYZveDVSKryaCfX3tXutag1sPakUOTtg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" jquery "~3.6.0" -"@abp/jstree@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jstree/-/jstree-5.3.2.tgz#71e9831b0b644f7af9f7b38076fffc266e16c377" - integrity sha512-nxulvfxuEthTtbYXzASdZXxdn4/z8iMSpp0LBxY8CLCztKczF7YTBeDzUEfyR2m9hUS0A6D3SAcNd08WMgY42Q== +"@abp/jstree@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jstree/-/jstree-5.3.3.tgz#0328b1bcb19216cbaff1e4a45d1c90745895fea8" + integrity sha512-LFrbKqAWBl2c1BcF5063JLU6WPdad4j0nDkgegDTVJlWc7+qU3aJxUSMUSLNUC+iSyOyswCy9mtoxNovzMJYwQ== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" jstree "^3.3.12" -"@abp/lodash@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.2.tgz#b3bfc70be099aae436badb4840a1f9715af5db36" - integrity sha512-IkeNEy8uiONy3VoHS7FVIL/bQVzTD1prmRMJ78dYNP8Qn317pG5/NEOgJXbka0zqR/mb2gXDg13kwlffsJWWlw== +"@abp/lodash@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.3.tgz#365684a338ab5d68adffa93207d0035eaa494ef9" + integrity sha512-Lqb2DkmKBPBHNbUd1QeATv8G/qUPamd06bKbe7xHesX3DZtlIwTmimwTpV4tqmJqOLKB67uUtapPYCfKyxs1RQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" lodash "^4.17.21" -"@abp/luxon@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.2.tgz#4d6039505d13edb30ef8b2f00bca69639cd2afd2" - integrity sha512-uxym895NuCsi5KE7JwiL2d+MnJMXZIu8xCutb0NtT89BvfjeZnAv8FOr4NjaYg+pmxTyj1i9RmBzfYsz0yvmkQ== +"@abp/luxon@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.3.tgz#97a60ae64e865d2b1c04107302d4ec50d4e09217" + integrity sha512-/7Lb463HREBFlt17tUFinTpYxfbZ8UIi1+d7Fqp8spJv78qCxvpWmD4iuJJJdCExO00ztZWY9GkCDPrAbfP/dA== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.2.tgz#99188d4b6497384720cf7168c909d32a39eff8a4" - integrity sha512-d2UcBQt4w7VqZdJjdb+JJpp9mFli7WbK7SrRTUeIINdKo3x4nrABbuKUgMBNxkroDVi1ErI0I4gwsVAGrMUPFw== +"@abp/malihu-custom-scrollbar-plugin@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.3.tgz#96be03f79be929b1a2cb67acb38e9d6638f04f15" + integrity sha512-hr5qmcVl+Wr6sIS10QerWRTfFvhmhq9e48G9Hx5oQZFjrIkfJRlxla0TYViHR2tRYCeDQGb4gYmN4Fc71mdcPg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/prismjs@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-5.3.2.tgz#76299d4eec3a41d518738bc0a94dc74e61552481" - integrity sha512-QwIGhUjWCWAi9lqrMIMEybjGM1WkADAFFhLB9R+Nk5Cj4dlgVe1PekypbWV0e3r300H6ZqJmgPcagKVG3G4bWg== +"@abp/prismjs@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-5.3.3.tgz#eccea1469cb4dfc15b87704d267bb36ad6f25758" + integrity sha512-XC0jQa9LqcuqpciDKSbc0wRo4sOK9sebX6eZBlbOnGIoHhNNbiwG0Vt60MHQ5DmaOz7k5jWP0gOISQMJ5GJfTw== dependencies: - "@abp/clipboard" "~5.3.2" - "@abp/core" "~5.3.2" + "@abp/clipboard" "~5.3.3" + "@abp/core" "~5.3.3" prismjs "^1.26.0" -"@abp/select2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.2.tgz#b39ddab8f0be539a880bdff7bc3307d9596a545d" - integrity sha512-JAf8LceHL5SUDBYRZ2BTpfIBRc4xyhE+9uo4ZqXXstLpJUUoaW2WlTSCNlBakSlR9k4Fprk9RjqVcrpNuWN+ew== +"@abp/select2@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.3.tgz#bdb8de1fcc5c9964233fdf1d4b88f7b90099f293" + integrity sha512-yk4CDpgksM5pAXMgFnULlgDovBk0oeXRhAA6lpt0TizzJ353WkpcASUblHbWOePzXbJFBBB2cj3XBD9vdWx7Ig== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" select2 "^4.0.13" -"@abp/slugify@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/slugify/-/slugify-5.3.2.tgz#627adf73eebf67bcd62d66da635efb17b64ae28b" - integrity sha512-EKGbLl6bg2tSlg3hlF620/bMZCXvATlKyJtteWSS+OkYy5T8DaFlQNY3AdXopPLLEfwaicJm6NJL8Eg2DSFPUg== +"@abp/slugify@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/slugify/-/slugify-5.3.3.tgz#0bd92e63607704c383f4eb411523060705331307" + integrity sha512-H51TFSEnhsElwJCyN6KPJ9OGZsQUswGwCB6PXNrdotf/4HQek1RpgYRGytIsI13H+E6XPW7SJVZM/29i+wtgZg== dependencies: slugify "^1.6.5" -"@abp/star-rating-svg@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-5.3.2.tgz#30bc8ae18b3a84e805b33f0b03cf650b9dbae1a2" - integrity sha512-vtsf6XYelYQLOqxKa4CVqsTmdrKDawwLjiVKvwUQxs/QP5Uy8jggqjnFTpPVZxZGOttUnVcAgrgn/ovLcDRntg== +"@abp/star-rating-svg@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-5.3.3.tgz#9b14dbda8157c8ce6f61e208b358b0d274c9d138" + integrity sha512-riKvT106NONKeMdh3j5qmk9HdbpD/4Q2puQZIMnZEguU3YSqRFs21xusk1i47HwGKOzdfdrhGM+6Mdil6brsxQ== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" star-rating-svg "^3.5.0" -"@abp/sweetalert2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.2.tgz#1ddb2caf2e82b6f0faa3420beda8a491c51fb1df" - integrity sha512-JSV33EVAK7y1VaYQf9HBLFjVkfUHvb3aeIta/xu0Wbw17JyJHrjlk/H0Z4ihkjPcCU2CDqVJCUUzhjdFFjHNag== +"@abp/sweetalert2@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.3.tgz#54a2d45ddbdaa2f7a4485aa5731f2fec65a9c771" + integrity sha512-Lbw6S+xTNMtHeFaMJNbYTMtqznDwRtlN4+f+hRGWbqNIpHuMfTi1jUgdeZTYRjbhY+RTduUJrs8lvvPMKWgrTw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.2.tgz#cb85f15a06cb85f82cdfa0c1454b20258014f613" - integrity sha512-jjUI+R4vRe/k9I2In5tp9PNKsf1quldVZA16vKRfxkF8TrN05RBF9ks5H+zlbe//okVCVl1Gz5MVt3XP7arEig== +"@abp/timeago@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.3.tgz#6e13a178d67e635ebe65d01db220d09f1673bafa" + integrity sha512-mBwaioPVnIeMXP6tDG24NZaTCAGvk8cMah8ems3OLWNK+tsPU4Jy8BVHTSmd/7rA69EL0REuSw2GmiCvaCL+RQ== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" timeago "^1.6.7" -"@abp/toastr@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.2.tgz#f714ff89267d5e375fa2c0c8bef40f3eeacedfe8" - integrity sha512-9ZTSo+4X4cuLdfOwGBWACMS4/379BulFsMW5kcDxFWW/EYhQ2ieE/CclYMeiOqeIL92rmurdVMHeum0MSH6hbg== +"@abp/toastr@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.3.tgz#a3d2d19963fe96da9566a0f320c7f9911901e69a" + integrity sha512-F1FJPQ0nnu/jZY4XpJFS7uFJgpoEl8aOeFkm6kvshK76ABFLvsWHYW88htW5gXIwOf+G/QClZdx39Os+IQaUJw== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" toastr "^2.1.4" -"@abp/tui-editor@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-5.3.2.tgz#6e7b88e61771b958e50465d569aca0f896c396d9" - integrity sha512-iXK+6sxjxPcMQEYRTnsW9njW/jcSUMQxPRGEeot/B5GIoyVQJNqMHmdiccsZQAp1L7t2OY5G+0HVjvXD3BZ6BQ== +"@abp/tui-editor@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-5.3.3.tgz#2c9f09fb8cf1dd98656d425f4f94896e9e3297ce" + integrity sha512-gXumOvfQc4D2e2fEG/nSja4sHwDARwnp2K41M7eSdaB/ENR0GT1SRfK24SdpnYSuzPnuhNR/GMY1c3jOJFNCRg== dependencies: - "@abp/jquery" "~5.3.2" - "@abp/prismjs" "~5.3.2" + "@abp/jquery" "~5.3.3" + "@abp/prismjs" "~5.3.3" -"@abp/uppy@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-5.3.2.tgz#1a2ef224382ee4d628de8b91fe40dac933853bbf" - integrity sha512-VQCVkQ4KEnunLyRHfT92F8gNdRvwKy2bxYPSazzstMCXWsjm7QDH4oOaLYL+LcVNamc9SBgy7ZdtAvc2yCcS0A== +"@abp/uppy@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-5.3.3.tgz#28b606d4d2612b85e07413b0d233dc91f2650840" + integrity sha512-fiuUEnmVK3cEcKDDSTu58Tl2bcNkI/ZgUc9HFvGOvXnvBOK9YRWS9cGs83o33x6Nl5zMXOgfyO88qMPKIW//8Q== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" uppy "^1.16.1" -"@abp/utils@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.2.tgz#03111ac799363db8948cc4b905b7eea437b01fb3" - integrity sha512-ZPrhzl+NiCXxudIv+XozMzwiIWM70AQo8VXl9el8pYiQH0oiEOcT4ny+VmWdMU/94ouW0F3h1cjpYGeJSUWO/w== +"@abp/utils@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.3.tgz#b47f11cb9a0ac963a7f4e5a44360d933e19896fc" + integrity sha512-owTYsROGHfXuHTOFe1uKMAwLbgjzQLKDnmApUy4taYy93rWsu98vFXX6rYJTK7U/X8nZq5y0BtH4covHyfsAxQ== dependencies: just-compare "^1.3.0" diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json index b98319f51b..8da6be8bd5 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json @@ -184,6 +184,9 @@ "CmsKit.BlogPost.ScrollIndex": "Quick navigation bar in blog posts", "Add": "Add", "AddWidget": "Add Widget", - "PleaseConfigureWidgets": "Please configure widgets" + "PleaseConfigureWidgets": "Please configure widgets", + "SelectAnAuthor":"Select an Author", + "InThisDocument":"In This Document", + "GoToTop":"Go To Top" } } \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml index 6f1f7a542d..9b7f6e24f7 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml @@ -12,13 +12,13 @@ { @if (Model.CurrentRating != null) { - + @L["Undo"] } if (Model.Ratings != null) { - + diff --git a/modules/docs/app/VoloDocs.Web/package.json b/modules/docs/app/VoloDocs.Web/package.json index 11df194026..d3c5da0d9a 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": "^5.3.2", - "@abp/docs": "^5.3.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.3", + "@abp/docs": "^5.3.3" } } diff --git a/modules/docs/app/VoloDocs.Web/yarn.lock b/modules/docs/app/VoloDocs.Web/yarn.lock index f3ece2f088..0618fd9a3c 100644 --- a/modules/docs/app/VoloDocs.Web/yarn.lock +++ b/modules/docs/app/VoloDocs.Web/yarn.lock @@ -2,45 +2,45 @@ # yarn lockfile v1 -"@abp/anchor-js@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/anchor-js/-/anchor-js-5.3.2.tgz#414048995a2d7942b1e1f7e551493216269a23d9" - integrity sha512-ZIJgI2fKMYsNHtTHkEzM15EoaXpiJ42xoen76v6rr2aj8qODWGeWseJDkX4Shid45/G+hx/hriMJfUOuQVjr/w== +"@abp/anchor-js@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/anchor-js/-/anchor-js-5.3.3.tgz#5c0c8de8c2e9afc3dbf5b800b9cc32bff734a6b8" + integrity sha512-ILs6UWexBjueqmJ0B+Mh5DB6Pf/0EjbtpJB1VNyyrIpQ2yT39cqBNUDyLZYWY/Xnxu5G/b42Jpl0thd5YKUJuA== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" anchor-js "^4.3.1" -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.2.tgz#d0798086ffcad7d0e58c1127cb212012c97f5c9f" - integrity sha512-FJeTr7ePMvBrMN018qWDjhT7xcmNgIBjes6XkE1V7h8Tc6Wyn5aBvXrrqEr1v4FbKm214t1VQy7NudIjMF/UFw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.2.tgz#7ffe5199d7df25b043919592edfbd15c5033acd6" - integrity sha512-8C6QTUqKfi2wCGo+uSZi4tEtPog/E/+F+jBDfT8tFj3eZ8UFZXwYFGUKKt/m1KsVCJ0ItHj1FxKSlpvgadcmtg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.2" - "@abp/bootstrap" "~5.3.2" - "@abp/bootstrap-datepicker" "~5.3.2" - "@abp/datatables.net-bs5" "~5.3.2" - "@abp/font-awesome" "~5.3.2" - "@abp/jquery-form" "~5.3.2" - "@abp/jquery-validation-unobtrusive" "~5.3.2" - "@abp/lodash" "~5.3.2" - "@abp/luxon" "~5.3.2" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.2" - "@abp/select2" "~5.3.2" - "@abp/sweetalert2" "~5.3.2" - "@abp/timeago" "~5.3.2" - "@abp/toastr" "~5.3.2" - -"@abp/aspnetcore.mvc.ui@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.2.tgz#59c8ba140898260c0e1f0612f135af17bd5ae146" - integrity sha512-o12lXWhckLsvYn7xmlOgsUot0WVc/Mljfrf/HIpyzntW1jL0aqGgnG4bNVDlF77fXiPlwK/7WpwHKugqXMPOPQ== +"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.3.tgz#dc6a1bdd583ef5ea0f8a0110753b0869d5f1cb61" + integrity sha512-det7xCtVZK6Dmvr0ENAkYdE+jRW0cVi3BCKZc7c6Hy0VKsKsKlnyz5j/D2rJSAmrap9hyQSWXBJUiho8W92wUQ== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.3" + +"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.3.tgz#65f97d787647e7760bb0c2a5b0f0ff815dc9630a" + integrity sha512-p/Z++QPM7S2lm7obXsZXIarcw0Y88y/Ghy5hyZqdc3uNHL6j8LRlD2qfuRXzl0k9HytXa859UKtSMLSZij1DiA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~5.3.3" + "@abp/bootstrap" "~5.3.3" + "@abp/bootstrap-datepicker" "~5.3.3" + "@abp/datatables.net-bs5" "~5.3.3" + "@abp/font-awesome" "~5.3.3" + "@abp/jquery-form" "~5.3.3" + "@abp/jquery-validation-unobtrusive" "~5.3.3" + "@abp/lodash" "~5.3.3" + "@abp/luxon" "~5.3.3" + "@abp/malihu-custom-scrollbar-plugin" "~5.3.3" + "@abp/select2" "~5.3.3" + "@abp/sweetalert2" "~5.3.3" + "@abp/timeago" "~5.3.3" + "@abp/toastr" "~5.3.3" + +"@abp/aspnetcore.mvc.ui@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.3.tgz#b8beb98bde3e4f0340335014ced7653c7913a621" + integrity sha512-aDQxdfQmlEXIjWGW8wru58imh9cncHAijafvdXlmyfKHM2JfnSSCG/RPMiaoJq/iyDVEggbhx8z4VHODC1eitg== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -49,180 +49,180 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.2.tgz#065b6d5b4dc484ed4c34c01209d319027e8967ea" - integrity sha512-uA2g1sThLIvGwirbLWLxExw46jnC63jjjs8aO5qSOrGrGfT6XB1OLgnnOPdFacZqPjYneGZ7ULXvOzGh2SsBYQ== +"@abp/bootstrap-datepicker@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.3.tgz#66bf2be128e6389877ed4465149c1933ca182c71" + integrity sha512-w/gPj4BVzVnmwekWVHKPYkwnhZFFH1XtCtw5LeJVM5bSYQBrvVTvvUPdKiiTDV59OYf2sbsA+PscwcTWAG6t/Q== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.2.tgz#7b2663b1d5b0ba8cd079dfb020e26b01fced3118" - integrity sha512-tdbzywiDnbsjNdOY0QBGYD/AtgchGSY7JQZoYczN9Rk4IZr7Axy1Dkw3sP/UBOQrxIOdUGlTEg2bi0MzAmTTig== +"@abp/bootstrap@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.3.tgz#56335b46bd42fba0a522712fbb6591fb6aeb5b68" + integrity sha512-xOtC690pE+QxZYhhQrpTE1rapEjg9BrJg7e0qvrkt4TLMZ4mIbau6/Qlh6x8uuMASCUUuRTLNUzHijxvOJh7Mg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" bootstrap "^5.1.3" -"@abp/clipboard@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-5.3.2.tgz#f1c00a66b3bbe46459b8f022fd54c098a9504673" - integrity sha512-e9TvKtBziGCmWw+lysqvd5CxqaIT2+L5anAx4xujiZR6EnBApLLqprlJyH7yAsxI4LJcKdBA+oj65xBtjVOm3w== +"@abp/clipboard@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-5.3.3.tgz#62c3c12f1ff503091924f672f71a50e2e5d0b47c" + integrity sha512-FRJPM9/P3WPuK4Id1KVfmpkOB3MrlrYp/beNqZtjqQuG8WDjVgnHrDnsPYfzeLdK5n6bEvtGWwtHwiaBOXhWZg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" clipboard "^2.0.8" -"@abp/core@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.2.tgz#f16026cdfd993c78904a5afe6642b5da8fbc6707" - integrity sha512-kCS8XtL2UyqYavWYGN8SY2A9PKdY5fJxKBEB6GMin4v6LzJB8f7auomLY+gFJs0PjG2rYcyT7sgVijNlOs4ypg== +"@abp/core@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.3.tgz#b03fc281d650d483c9276591f2adb26ea43dcd1e" + integrity sha512-Pp8U+LjchtSxc9lTRaPNQhb+Eh7X2LVERmZvoWyET0y/st28PJZ4eZ4iyGmV00pEmCpadF5aTWVhJcGH32scdQ== dependencies: - "@abp/utils" "~5.3.2" + "@abp/utils" "~5.3.3" -"@abp/datatables.net-bs5@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.2.tgz#bcccfe383ea271f845d25134307c2b407a513c33" - integrity sha512-MTaJW8LKvxOqzWFqmSZP3RcI3ygzB9sC8gH6J3ayILIXuMR+MjWe2OEMYAAQaT/582pME1wHtbp/dthkz6cmRQ== +"@abp/datatables.net-bs5@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.3.tgz#e00304fbe7e6d9d33e1082485f7aa07de48fac0c" + integrity sha512-dkbP3PPkMRJqxravYO7NIVww+MQC3FxHP7mPCg/+PG/LttaNJ5L5hoNcb7BMK2K76hBRMdvlSIzvjycb1w1ooA== dependencies: - "@abp/datatables.net" "~5.3.2" + "@abp/datatables.net" "~5.3.3" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.2.tgz#870959555907cad03dbcb8b3866f2be4aea7a16e" - integrity sha512-7F3dCqBmBzm8h6cM1tl8JG1eras7GaSbDKqJY3CqVCnDgJsk1O966p0VrZjWBxWKJrCoQCDX7+vid9UJlo/1aw== +"@abp/datatables.net@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.3.tgz#6d8eca1034e26708b9adf0d5917aefd5772cbf30" + integrity sha512-1JuXMzHDtrvGRNBYdwEVobiYmhd7VxM432ciARX8hzvSkE0jcgzeTrSlBXfenFMPOIAUJsSOE4YVshtqrY0G4g== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" datatables.net "^1.11.4" -"@abp/docs@^5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/docs/-/docs-5.3.2.tgz#5d7d7fcd4e5fe0d20118f5153135e8c5555c8b5b" - integrity sha512-CCHyvIE/drntklqj/nsKGjCtJHjL6Wh1E/ztiH6K99HHje0mDSfOFLWWAssDTihNFRmVhHJyECR8EK0b5SwlIQ== +"@abp/docs@^5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/docs/-/docs-5.3.3.tgz#6792dd211c430ccbca02674f8d248490553340e6" + integrity sha512-pR+3JXg+kvr6wKOT2xVJq4sZlfUXWVY9OalFXWyMjglySEVlsN2U+zpIrRmZDiab0xT6NXVSJ15uMkyoRpZCTg== dependencies: - "@abp/anchor-js" "~5.3.2" - "@abp/clipboard" "~5.3.2" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.2" - "@abp/popper.js" "~5.3.2" - "@abp/prismjs" "~5.3.2" + "@abp/anchor-js" "~5.3.3" + "@abp/clipboard" "~5.3.3" + "@abp/malihu-custom-scrollbar-plugin" "~5.3.3" + "@abp/popper.js" "~5.3.3" + "@abp/prismjs" "~5.3.3" -"@abp/font-awesome@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.2.tgz#2ae82288e1c4d664b673d2d7ec264f05fac98d7a" - integrity sha512-ZXNbI+U++Kz73FAEtWCc6KMZYQehqOQCSPEC4AfpYptK6fQ4weTARWzdfWcXluNSPeBtdl3Of+IR4TRjjUEyPA== +"@abp/font-awesome@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.3.tgz#b10a530c9dee28838536746ea2a40342ff2ee3a8" + integrity sha512-c+cvsQ1uolSoyTkM9rZYYM07iiq/Zu8zKOQaDbitQMfPkcfSnC3PG/PTNauSYuwh/SyFfacFXeaDQ5Y/kAGRLw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.2.tgz#0dc63c9b546a4aef4967fad90e6cd010aae976fa" - integrity sha512-S6lWlz32RgZj+ETrg214kOm5++HNiW4ftNRP4DMbwkq3dHvRvHqywdmVLfwaRciAsYpGqu0fl6T4P2WHiPRw2w== +"@abp/jquery-form@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.3.tgz#94234207aa991e098e49e7d1244dc86d289a48e6" + integrity sha512-TY5c4ODfSidYGWqUR+QMNbxasfSufSg9gLY8lTEaJn2Wd2+o3GlauPxlTeNIRCRsxqb8e5+fBJspq1YbtE8vQg== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.2.tgz#91a393a24ab60fce366c65ba23bddf36411da7cb" - integrity sha512-8V99Oaff6P7dQ46klCcl/CmC1OY6MJ43SyUnOltRCVeIodga8wK8rgvJFM5tYZQVmIdNtdxrUziNMw611N+3Uw== +"@abp/jquery-validation-unobtrusive@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.3.tgz#03f776807b60f32d2470c3d3c975ee20f33a993d" + integrity sha512-BNa2oSOfc5CSLW62SLCOinP7ybDDSVjfn0LYdDOdkIpSPnoL/3E1ZmgEzkDCUdTfJ67320kGDtIHCpb+Wbik+Q== dependencies: - "@abp/jquery-validation" "~5.3.2" + "@abp/jquery-validation" "~5.3.3" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.2.tgz#18a0f7ca797adebe9393732a62251760f34f66f0" - integrity sha512-uokx6CKtHlu8WCe3YogPi+24KG15hOi7vvtiwvwZ2dV9rJpbAnDYnq7NLwjh1JFlRGsPp8vpLi9m9zilKf1CDg== +"@abp/jquery-validation@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.3.tgz#a0544428b94966f35d3aebb40c354d3f4485137d" + integrity sha512-GFhrS4pVmbQRI0eiW2aBYmRTB0rR2s3Wj4NIVB69ZHwvy+uADA3M/oMs8Q4wuT+gmPu2GCjPNCc5RPsC173VPA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.2.tgz#add343f7a69a2bad7f7195a616ea4fd75abcb223" - integrity sha512-s8yfkAY1xRRc/WHkrC0mDJAW3j28b/w0EMIKv+IKi6xOExqZ9/PxWDC7HIdHt3lTvHf3I9jHumypZwNyC4PP1A== +"@abp/jquery@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.3.tgz#be70aa671129fac192b8f858a973e65018960cbd" + integrity sha512-sUy0aquZPq+HyxChYJMTjUZxaTo5/Aav5JcbMq1RczIFidjOrFHthWnYZveDVSKryaCfX3tXutag1sPakUOTtg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" jquery "~3.6.0" -"@abp/lodash@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.2.tgz#b3bfc70be099aae436badb4840a1f9715af5db36" - integrity sha512-IkeNEy8uiONy3VoHS7FVIL/bQVzTD1prmRMJ78dYNP8Qn317pG5/NEOgJXbka0zqR/mb2gXDg13kwlffsJWWlw== +"@abp/lodash@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.3.tgz#365684a338ab5d68adffa93207d0035eaa494ef9" + integrity sha512-Lqb2DkmKBPBHNbUd1QeATv8G/qUPamd06bKbe7xHesX3DZtlIwTmimwTpV4tqmJqOLKB67uUtapPYCfKyxs1RQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" lodash "^4.17.21" -"@abp/luxon@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.2.tgz#4d6039505d13edb30ef8b2f00bca69639cd2afd2" - integrity sha512-uxym895NuCsi5KE7JwiL2d+MnJMXZIu8xCutb0NtT89BvfjeZnAv8FOr4NjaYg+pmxTyj1i9RmBzfYsz0yvmkQ== +"@abp/luxon@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.3.tgz#97a60ae64e865d2b1c04107302d4ec50d4e09217" + integrity sha512-/7Lb463HREBFlt17tUFinTpYxfbZ8UIi1+d7Fqp8spJv78qCxvpWmD4iuJJJdCExO00ztZWY9GkCDPrAbfP/dA== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.2.tgz#99188d4b6497384720cf7168c909d32a39eff8a4" - integrity sha512-d2UcBQt4w7VqZdJjdb+JJpp9mFli7WbK7SrRTUeIINdKo3x4nrABbuKUgMBNxkroDVi1ErI0I4gwsVAGrMUPFw== +"@abp/malihu-custom-scrollbar-plugin@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.3.tgz#96be03f79be929b1a2cb67acb38e9d6638f04f15" + integrity sha512-hr5qmcVl+Wr6sIS10QerWRTfFvhmhq9e48G9Hx5oQZFjrIkfJRlxla0TYViHR2tRYCeDQGb4gYmN4Fc71mdcPg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/popper.js@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/popper.js/-/popper.js-5.3.2.tgz#ab92ca12c10211464856281ba665f9d948dbc084" - integrity sha512-wgQczdnorfENIhfflZJ1t77DgTuKEwV5vYoB4n4QShcvbBXDj+Y7M5vQAz19U6AlCyiivNGMPnbXqu0sJnoADQ== +"@abp/popper.js@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/popper.js/-/popper.js-5.3.3.tgz#4cdb30008a8f1d8381c28f190ace82d5fdd5d517" + integrity sha512-h/gFCnbQWyJVkPU9MrUjuwzmXog9rU7XF08qqiFObbE1QCa527iOglgZGMZoKB5+x3hBNIYGol7/8B/3J3mgyw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" "@popperjs/core" "^2.11.2" -"@abp/prismjs@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-5.3.2.tgz#76299d4eec3a41d518738bc0a94dc74e61552481" - integrity sha512-QwIGhUjWCWAi9lqrMIMEybjGM1WkADAFFhLB9R+Nk5Cj4dlgVe1PekypbWV0e3r300H6ZqJmgPcagKVG3G4bWg== +"@abp/prismjs@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-5.3.3.tgz#eccea1469cb4dfc15b87704d267bb36ad6f25758" + integrity sha512-XC0jQa9LqcuqpciDKSbc0wRo4sOK9sebX6eZBlbOnGIoHhNNbiwG0Vt60MHQ5DmaOz7k5jWP0gOISQMJ5GJfTw== dependencies: - "@abp/clipboard" "~5.3.2" - "@abp/core" "~5.3.2" + "@abp/clipboard" "~5.3.3" + "@abp/core" "~5.3.3" prismjs "^1.26.0" -"@abp/select2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.2.tgz#b39ddab8f0be539a880bdff7bc3307d9596a545d" - integrity sha512-JAf8LceHL5SUDBYRZ2BTpfIBRc4xyhE+9uo4ZqXXstLpJUUoaW2WlTSCNlBakSlR9k4Fprk9RjqVcrpNuWN+ew== +"@abp/select2@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.3.tgz#bdb8de1fcc5c9964233fdf1d4b88f7b90099f293" + integrity sha512-yk4CDpgksM5pAXMgFnULlgDovBk0oeXRhAA6lpt0TizzJ353WkpcASUblHbWOePzXbJFBBB2cj3XBD9vdWx7Ig== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.2.tgz#1ddb2caf2e82b6f0faa3420beda8a491c51fb1df" - integrity sha512-JSV33EVAK7y1VaYQf9HBLFjVkfUHvb3aeIta/xu0Wbw17JyJHrjlk/H0Z4ihkjPcCU2CDqVJCUUzhjdFFjHNag== +"@abp/sweetalert2@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.3.tgz#54a2d45ddbdaa2f7a4485aa5731f2fec65a9c771" + integrity sha512-Lbw6S+xTNMtHeFaMJNbYTMtqznDwRtlN4+f+hRGWbqNIpHuMfTi1jUgdeZTYRjbhY+RTduUJrs8lvvPMKWgrTw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.2.tgz#cb85f15a06cb85f82cdfa0c1454b20258014f613" - integrity sha512-jjUI+R4vRe/k9I2In5tp9PNKsf1quldVZA16vKRfxkF8TrN05RBF9ks5H+zlbe//okVCVl1Gz5MVt3XP7arEig== +"@abp/timeago@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.3.tgz#6e13a178d67e635ebe65d01db220d09f1673bafa" + integrity sha512-mBwaioPVnIeMXP6tDG24NZaTCAGvk8cMah8ems3OLWNK+tsPU4Jy8BVHTSmd/7rA69EL0REuSw2GmiCvaCL+RQ== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" timeago "^1.6.7" -"@abp/toastr@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.2.tgz#f714ff89267d5e375fa2c0c8bef40f3eeacedfe8" - integrity sha512-9ZTSo+4X4cuLdfOwGBWACMS4/379BulFsMW5kcDxFWW/EYhQ2ieE/CclYMeiOqeIL92rmurdVMHeum0MSH6hbg== +"@abp/toastr@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.3.tgz#a3d2d19963fe96da9566a0f320c7f9911901e69a" + integrity sha512-F1FJPQ0nnu/jZY4XpJFS7uFJgpoEl8aOeFkm6kvshK76ABFLvsWHYW88htW5gXIwOf+G/QClZdx39Os+IQaUJw== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" toastr "^2.1.4" -"@abp/utils@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.2.tgz#03111ac799363db8948cc4b905b7eea437b01fb3" - integrity sha512-ZPrhzl+NiCXxudIv+XozMzwiIWM70AQo8VXl9el8pYiQH0oiEOcT4ny+VmWdMU/94ouW0F3h1cjpYGeJSUWO/w== +"@abp/utils@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.3.tgz#b47f11cb9a0ac963a7f4e5a44360d933e19896fc" + integrity sha512-owTYsROGHfXuHTOFe1uKMAwLbgjzQLKDnmApUy4taYy93rWsu98vFXX6rYJTK7U/X8nZq5y0BtH4covHyfsAxQ== dependencies: just-compare "^1.3.0" diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ar.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ar.json index 173166135b..2d19b28989 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ar.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ar.json @@ -5,6 +5,7 @@ "Users": "المستخدمون", "NewUser": "مستخدم جديد", "UserName": "اسم المستخدم", + "Surname": "اللقب", "EmailAddress": "البريد الإلكتروني", "PhoneNumber": "رقم الهاتف", "UserInformations": "معلومات المستخدم", diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/cs.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/cs.json index 37e49117ce..45a50180ba 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/cs.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/cs.json @@ -5,6 +5,7 @@ "Users": "Uživatelé", "NewUser": "Nový uživatel", "UserName": "Uživatelské jméno", + "Surname": "Příjmení", "EmailAddress": "Email", "PhoneNumber": "Telefonní číslo", "UserInformations": "Uživatelské informace", diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/de-DE.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/de-DE.json index c489832a7c..f091299ac2 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/de-DE.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/de-DE.json @@ -5,6 +5,7 @@ "Users": "Benutzer", "NewUser": "Neuer Benutzer", "UserName": "Benutzername", + "Surname": "Nachname", "EmailAddress": "E-Mail-Adresse", "PhoneNumber": "Telefonnummer", "UserInformations": "Nutzerinformation", diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/de.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/de.json index c42db49981..cd87fb2427 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/de.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/de.json @@ -5,6 +5,7 @@ "Users": "Benutzer", "NewUser": "Neuer Benutzer", "UserName": "Benutzername", + "Surname": "Nachname", "EmailAddress": "E-Mail-Adresse", "PhoneNumber": "Telefonnummer", "UserInformations": "Benutzerinformationen", diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en-GB.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en-GB.json index 3dadb593af..3efd41afd5 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en-GB.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en-GB.json @@ -5,6 +5,7 @@ "Users": "Users", "NewUser": "New user", "UserName": "Username", + "Surname": "Surname", "EmailAddress": "Email address", "PhoneNumber": "Phone number", "UserInformations": "User information", diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en.json index 97d5bbcd75..3a67018bb8 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en.json @@ -5,6 +5,7 @@ "Users": "Users", "NewUser": "New user", "UserName": "User name", + "Surname":"Surname", "EmailAddress": "Email address", "PhoneNumber": "Phone number", "UserInformations": "User information", diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/es.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/es.json index e3e1fddc31..48cd0522d3 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/es.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/es.json @@ -5,6 +5,7 @@ "Users": "Usuarios", "NewUser": "Nuevo Usuario", "UserName": "Nombre de usuario", + "Surname": "Apellido", "EmailAddress": "Dirección e-mail", "PhoneNumber": "Número de teléfono", "UserInformations": "Información de usuario", diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/fi.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/fi.json index 9d7d2b4b85..f0be798b90 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/fi.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/fi.json @@ -5,6 +5,7 @@ "Users": "Käyttäjät", "NewUser": "Uusi käyttäjä", "UserName": "Käyttäjänimi", + "Surname": "Sukunimi", "EmailAddress": "Sähköpostiosoite", "PhoneNumber": "Puhelinnumero", "UserInformations": "Käyttäjän tiedot", diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/fr.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/fr.json index d34a0568a9..9a7d0294fb 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/fr.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/fr.json @@ -5,6 +5,7 @@ "Users": "Utilisateurs", "NewUser": "Nouvel utilisateur", "UserName": "Nom d’utilisateur", + "Surname": "Nom", "EmailAddress": "Adresse e-mail", "PhoneNumber": "Numéro de téléphone", "UserInformations": "Informations utilisateur", diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/hi.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/hi.json index 9e31f898d5..898e664b5b 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/hi.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/hi.json @@ -5,6 +5,7 @@ "Users": "उपयोगकर्ताओं", "NewUser": "नया उपयोगकर्ता", "UserName": "उपयोगकर्ता नाम", + "Surname": "उपनाम", "EmailAddress": "ईमेल पता", "PhoneNumber": "फ़ोन नंबर", "UserInformations": "यूजर जानकारी", diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/hu.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/hu.json index d63b3f5b76..fe3b0122c9 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/hu.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/hu.json @@ -5,6 +5,7 @@ "Users": "Felhasználók", "NewUser": "Új felhasználó", "UserName": "Felhasználónév", + "Surname": "Vezetéknév", "EmailAddress": "Email cím", "PhoneNumber": "Telefonszám", "UserInformations": "Felhasználói információ", diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/is.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/is.json index 196bda39e6..d80b315c91 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/is.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/is.json @@ -5,6 +5,7 @@ "Users": "Notendur", "NewUser": "Nýr notandi", "UserName": "Notandanafn", + "Surname": "Eftirnafn", "EmailAddress": "Netfang", "PhoneNumber": "Símanúmer", "UserInformations": "Notandaupplýsingar", diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/it.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/it.json index 729061108d..d486248b4d 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/it.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/it.json @@ -5,6 +5,7 @@ "Users": "Utenti", "NewUser": "Nuovo utente", "UserName": "Nome utente", + "Surname": "Cognome", "EmailAddress": "Indirizzo e-mail", "PhoneNumber": "Numero di telefono", "UserInformations": "Informazioni utente", diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/nl.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/nl.json index 63755a66d1..476ccd6ed5 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/nl.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/nl.json @@ -5,6 +5,7 @@ "Users": "Gebruikers", "NewUser": "Nieuwe Gebruiker", "UserName": "Gebruikersnaam", + "Surname": "Achternaam", "EmailAddress": "E-mail adres", "PhoneNumber": "Telefoonnummer", "UserInformations": "Gebruikers informatie", diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/pl-PL.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/pl-PL.json index 2ca4863845..8acea51398 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/pl-PL.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/pl-PL.json @@ -5,6 +5,7 @@ "Users": "Użytkownicy", "NewUser": "Nowy użytkownik", "UserName": "Nazwa użytkownika", + "Surname": "Nazwisko", "EmailAddress": "Adres email", "PhoneNumber": "Numer telefonu", "UserInformations": "Notyfikacje użytkownika", diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/pt-BR.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/pt-BR.json index 23befda585..5b96b8e88d 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/pt-BR.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/pt-BR.json @@ -5,6 +5,7 @@ "Users": "Usuários", "NewUser": "Novo Usuário", "UserName": "Usuário", + "Surname": "Sobrenome", "EmailAddress": "E-mail", "PhoneNumber": "Telefone", "UserInformations": "Informações do Usuário", diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ro-RO.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ro-RO.json index 85b549a646..d08702a356 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ro-RO.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ro-RO.json @@ -5,6 +5,7 @@ "Users": "Utilizatori", "NewUser": "Utilizator nou", "UserName": "Nume de utilizator", + "Surname": "Nume", "EmailAddress": "Adresa de email", "PhoneNumber": "Număr de telefon", "UserInformations": "Informaţii de utilizator", diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ru.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ru.json index 817474e47d..23657b6e5a 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ru.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ru.json @@ -5,6 +5,7 @@ "Users": "Пользователи", "NewUser": "Новый пользователь", "UserName": "Имя пользователя", + "Surname": "Фамилия", "EmailAddress": "Адрес электронной почты", "PhoneNumber": "Номер телефона", "UserInformations": "Информация о пользователе", diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/sk.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/sk.json index 57beb70419..f6792914c3 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/sk.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/sk.json @@ -5,6 +5,7 @@ "Users": "Používatelia", "NewUser": "Nový používateľ", "UserName": "Meno používateľa", + "Surname": "Priezvisko", "EmailAddress": "Emailová adresa", "PhoneNumber": "Telefónne číslo", "UserInformations": "Informácie o používateľovi", diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/sl.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/sl.json index 8181130e22..c775c3e234 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/sl.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/sl.json @@ -5,6 +5,7 @@ "Users": "Uporabniki", "NewUser": "Nov uporabnik", "UserName": "Uporabniško ime", + "Surname": "Priimek", "EmailAddress": "E-poštni naslov", "PhoneNumber": "Telefonska številka", "UserInformations": "Informacije o uporabniku", diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/tr.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/tr.json index b55de9e3a3..0c94889184 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/tr.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/tr.json @@ -5,6 +5,7 @@ "Users": "Kullanıcılar", "NewUser": "Yeni kullanıcı", "UserName": "Kullanıcı adı", + "Surname": "Soyadı", "EmailAddress": "E-posta adresi", "PhoneNumber": "Telefon numarası", "UserInformations": "Kullanıcı bilgileri", diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/vi.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/vi.json index a1de33308a..1cb39cec2a 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/vi.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/vi.json @@ -5,6 +5,7 @@ "Users": "Người dùng", "NewUser": "Tạo người dùng mới", "UserName": "Tên đăng nhập", + "Surname": "Họ", "EmailAddress": "Địa chỉ email", "PhoneNumber": "Số điện thoại", "UserInformations": "Thông tin người dùng", diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hans.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hans.json index 228296c0f6..c622c1a310 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hans.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hans.json @@ -5,6 +5,7 @@ "Users": "用户", "NewUser": "新用户", "UserName": "用户名称", + "Surname": "姓", "EmailAddress": "邮箱地址", "PhoneNumber": "手机号", "UserInformations": "用户信息", diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hant.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hant.json index a255929a1a..99be7e03bf 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hant.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hant.json @@ -5,6 +5,7 @@ "Users": "使用者", "NewUser": "新使用者", "UserName": "使用者名稱", + "Surname": "姓", "EmailAddress": "電子信箱地址", "PhoneNumber": "手機號碼", "UserInformations": "用戶資訊", diff --git a/modules/openiddict/app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.csproj b/modules/openiddict/app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.csproj index 227a4bfd7b..97453af046 100644 --- a/modules/openiddict/app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.csproj +++ b/modules/openiddict/app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.csproj @@ -40,10 +40,10 @@ - - - - + + + + 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 516f836ada..3861e9ec5f 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": "^5.3.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.3" } } 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 0dc603bcbd..95455e841f 100644 --- a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock +++ b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.2.tgz#d0798086ffcad7d0e58c1127cb212012c97f5c9f" - integrity sha512-FJeTr7ePMvBrMN018qWDjhT7xcmNgIBjes6XkE1V7h8Tc6Wyn5aBvXrrqEr1v4FbKm214t1VQy7NudIjMF/UFw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.2.tgz#7ffe5199d7df25b043919592edfbd15c5033acd6" - integrity sha512-8C6QTUqKfi2wCGo+uSZi4tEtPog/E/+F+jBDfT8tFj3eZ8UFZXwYFGUKKt/m1KsVCJ0ItHj1FxKSlpvgadcmtg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.2" - "@abp/bootstrap" "~5.3.2" - "@abp/bootstrap-datepicker" "~5.3.2" - "@abp/datatables.net-bs5" "~5.3.2" - "@abp/font-awesome" "~5.3.2" - "@abp/jquery-form" "~5.3.2" - "@abp/jquery-validation-unobtrusive" "~5.3.2" - "@abp/lodash" "~5.3.2" - "@abp/luxon" "~5.3.2" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.2" - "@abp/select2" "~5.3.2" - "@abp/sweetalert2" "~5.3.2" - "@abp/timeago" "~5.3.2" - "@abp/toastr" "~5.3.2" - -"@abp/aspnetcore.mvc.ui@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.2.tgz#59c8ba140898260c0e1f0612f135af17bd5ae146" - integrity sha512-o12lXWhckLsvYn7xmlOgsUot0WVc/Mljfrf/HIpyzntW1jL0aqGgnG4bNVDlF77fXiPlwK/7WpwHKugqXMPOPQ== +"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.3.tgz#dc6a1bdd583ef5ea0f8a0110753b0869d5f1cb61" + integrity sha512-det7xCtVZK6Dmvr0ENAkYdE+jRW0cVi3BCKZc7c6Hy0VKsKsKlnyz5j/D2rJSAmrap9hyQSWXBJUiho8W92wUQ== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.3" + +"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.3.tgz#65f97d787647e7760bb0c2a5b0f0ff815dc9630a" + integrity sha512-p/Z++QPM7S2lm7obXsZXIarcw0Y88y/Ghy5hyZqdc3uNHL6j8LRlD2qfuRXzl0k9HytXa859UKtSMLSZij1DiA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~5.3.3" + "@abp/bootstrap" "~5.3.3" + "@abp/bootstrap-datepicker" "~5.3.3" + "@abp/datatables.net-bs5" "~5.3.3" + "@abp/font-awesome" "~5.3.3" + "@abp/jquery-form" "~5.3.3" + "@abp/jquery-validation-unobtrusive" "~5.3.3" + "@abp/lodash" "~5.3.3" + "@abp/luxon" "~5.3.3" + "@abp/malihu-custom-scrollbar-plugin" "~5.3.3" + "@abp/select2" "~5.3.3" + "@abp/sweetalert2" "~5.3.3" + "@abp/timeago" "~5.3.3" + "@abp/toastr" "~5.3.3" + +"@abp/aspnetcore.mvc.ui@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.3.tgz#b8beb98bde3e4f0340335014ced7653c7913a621" + integrity sha512-aDQxdfQmlEXIjWGW8wru58imh9cncHAijafvdXlmyfKHM2JfnSSCG/RPMiaoJq/iyDVEggbhx8z4VHODC1eitg== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.2.tgz#065b6d5b4dc484ed4c34c01209d319027e8967ea" - integrity sha512-uA2g1sThLIvGwirbLWLxExw46jnC63jjjs8aO5qSOrGrGfT6XB1OLgnnOPdFacZqPjYneGZ7ULXvOzGh2SsBYQ== +"@abp/bootstrap-datepicker@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.3.tgz#66bf2be128e6389877ed4465149c1933ca182c71" + integrity sha512-w/gPj4BVzVnmwekWVHKPYkwnhZFFH1XtCtw5LeJVM5bSYQBrvVTvvUPdKiiTDV59OYf2sbsA+PscwcTWAG6t/Q== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.2.tgz#7b2663b1d5b0ba8cd079dfb020e26b01fced3118" - integrity sha512-tdbzywiDnbsjNdOY0QBGYD/AtgchGSY7JQZoYczN9Rk4IZr7Axy1Dkw3sP/UBOQrxIOdUGlTEg2bi0MzAmTTig== +"@abp/bootstrap@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.3.tgz#56335b46bd42fba0a522712fbb6591fb6aeb5b68" + integrity sha512-xOtC690pE+QxZYhhQrpTE1rapEjg9BrJg7e0qvrkt4TLMZ4mIbau6/Qlh6x8uuMASCUUuRTLNUzHijxvOJh7Mg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" bootstrap "^5.1.3" -"@abp/core@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.2.tgz#f16026cdfd993c78904a5afe6642b5da8fbc6707" - integrity sha512-kCS8XtL2UyqYavWYGN8SY2A9PKdY5fJxKBEB6GMin4v6LzJB8f7auomLY+gFJs0PjG2rYcyT7sgVijNlOs4ypg== +"@abp/core@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.3.tgz#b03fc281d650d483c9276591f2adb26ea43dcd1e" + integrity sha512-Pp8U+LjchtSxc9lTRaPNQhb+Eh7X2LVERmZvoWyET0y/st28PJZ4eZ4iyGmV00pEmCpadF5aTWVhJcGH32scdQ== dependencies: - "@abp/utils" "~5.3.2" + "@abp/utils" "~5.3.3" -"@abp/datatables.net-bs5@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.2.tgz#bcccfe383ea271f845d25134307c2b407a513c33" - integrity sha512-MTaJW8LKvxOqzWFqmSZP3RcI3ygzB9sC8gH6J3ayILIXuMR+MjWe2OEMYAAQaT/582pME1wHtbp/dthkz6cmRQ== +"@abp/datatables.net-bs5@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.3.tgz#e00304fbe7e6d9d33e1082485f7aa07de48fac0c" + integrity sha512-dkbP3PPkMRJqxravYO7NIVww+MQC3FxHP7mPCg/+PG/LttaNJ5L5hoNcb7BMK2K76hBRMdvlSIzvjycb1w1ooA== dependencies: - "@abp/datatables.net" "~5.3.2" + "@abp/datatables.net" "~5.3.3" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.2.tgz#870959555907cad03dbcb8b3866f2be4aea7a16e" - integrity sha512-7F3dCqBmBzm8h6cM1tl8JG1eras7GaSbDKqJY3CqVCnDgJsk1O966p0VrZjWBxWKJrCoQCDX7+vid9UJlo/1aw== +"@abp/datatables.net@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.3.tgz#6d8eca1034e26708b9adf0d5917aefd5772cbf30" + integrity sha512-1JuXMzHDtrvGRNBYdwEVobiYmhd7VxM432ciARX8hzvSkE0jcgzeTrSlBXfenFMPOIAUJsSOE4YVshtqrY0G4g== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.2.tgz#2ae82288e1c4d664b673d2d7ec264f05fac98d7a" - integrity sha512-ZXNbI+U++Kz73FAEtWCc6KMZYQehqOQCSPEC4AfpYptK6fQ4weTARWzdfWcXluNSPeBtdl3Of+IR4TRjjUEyPA== +"@abp/font-awesome@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.3.tgz#b10a530c9dee28838536746ea2a40342ff2ee3a8" + integrity sha512-c+cvsQ1uolSoyTkM9rZYYM07iiq/Zu8zKOQaDbitQMfPkcfSnC3PG/PTNauSYuwh/SyFfacFXeaDQ5Y/kAGRLw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.2.tgz#0dc63c9b546a4aef4967fad90e6cd010aae976fa" - integrity sha512-S6lWlz32RgZj+ETrg214kOm5++HNiW4ftNRP4DMbwkq3dHvRvHqywdmVLfwaRciAsYpGqu0fl6T4P2WHiPRw2w== +"@abp/jquery-form@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.3.tgz#94234207aa991e098e49e7d1244dc86d289a48e6" + integrity sha512-TY5c4ODfSidYGWqUR+QMNbxasfSufSg9gLY8lTEaJn2Wd2+o3GlauPxlTeNIRCRsxqb8e5+fBJspq1YbtE8vQg== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.2.tgz#91a393a24ab60fce366c65ba23bddf36411da7cb" - integrity sha512-8V99Oaff6P7dQ46klCcl/CmC1OY6MJ43SyUnOltRCVeIodga8wK8rgvJFM5tYZQVmIdNtdxrUziNMw611N+3Uw== +"@abp/jquery-validation-unobtrusive@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.3.tgz#03f776807b60f32d2470c3d3c975ee20f33a993d" + integrity sha512-BNa2oSOfc5CSLW62SLCOinP7ybDDSVjfn0LYdDOdkIpSPnoL/3E1ZmgEzkDCUdTfJ67320kGDtIHCpb+Wbik+Q== dependencies: - "@abp/jquery-validation" "~5.3.2" + "@abp/jquery-validation" "~5.3.3" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.2.tgz#18a0f7ca797adebe9393732a62251760f34f66f0" - integrity sha512-uokx6CKtHlu8WCe3YogPi+24KG15hOi7vvtiwvwZ2dV9rJpbAnDYnq7NLwjh1JFlRGsPp8vpLi9m9zilKf1CDg== +"@abp/jquery-validation@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.3.tgz#a0544428b94966f35d3aebb40c354d3f4485137d" + integrity sha512-GFhrS4pVmbQRI0eiW2aBYmRTB0rR2s3Wj4NIVB69ZHwvy+uADA3M/oMs8Q4wuT+gmPu2GCjPNCc5RPsC173VPA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.2.tgz#add343f7a69a2bad7f7195a616ea4fd75abcb223" - integrity sha512-s8yfkAY1xRRc/WHkrC0mDJAW3j28b/w0EMIKv+IKi6xOExqZ9/PxWDC7HIdHt3lTvHf3I9jHumypZwNyC4PP1A== +"@abp/jquery@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.3.tgz#be70aa671129fac192b8f858a973e65018960cbd" + integrity sha512-sUy0aquZPq+HyxChYJMTjUZxaTo5/Aav5JcbMq1RczIFidjOrFHthWnYZveDVSKryaCfX3tXutag1sPakUOTtg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" jquery "~3.6.0" -"@abp/lodash@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.2.tgz#b3bfc70be099aae436badb4840a1f9715af5db36" - integrity sha512-IkeNEy8uiONy3VoHS7FVIL/bQVzTD1prmRMJ78dYNP8Qn317pG5/NEOgJXbka0zqR/mb2gXDg13kwlffsJWWlw== +"@abp/lodash@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.3.tgz#365684a338ab5d68adffa93207d0035eaa494ef9" + integrity sha512-Lqb2DkmKBPBHNbUd1QeATv8G/qUPamd06bKbe7xHesX3DZtlIwTmimwTpV4tqmJqOLKB67uUtapPYCfKyxs1RQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" lodash "^4.17.21" -"@abp/luxon@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.2.tgz#4d6039505d13edb30ef8b2f00bca69639cd2afd2" - integrity sha512-uxym895NuCsi5KE7JwiL2d+MnJMXZIu8xCutb0NtT89BvfjeZnAv8FOr4NjaYg+pmxTyj1i9RmBzfYsz0yvmkQ== +"@abp/luxon@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.3.tgz#97a60ae64e865d2b1c04107302d4ec50d4e09217" + integrity sha512-/7Lb463HREBFlt17tUFinTpYxfbZ8UIi1+d7Fqp8spJv78qCxvpWmD4iuJJJdCExO00ztZWY9GkCDPrAbfP/dA== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.2.tgz#99188d4b6497384720cf7168c909d32a39eff8a4" - integrity sha512-d2UcBQt4w7VqZdJjdb+JJpp9mFli7WbK7SrRTUeIINdKo3x4nrABbuKUgMBNxkroDVi1ErI0I4gwsVAGrMUPFw== +"@abp/malihu-custom-scrollbar-plugin@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.3.tgz#96be03f79be929b1a2cb67acb38e9d6638f04f15" + integrity sha512-hr5qmcVl+Wr6sIS10QerWRTfFvhmhq9e48G9Hx5oQZFjrIkfJRlxla0TYViHR2tRYCeDQGb4gYmN4Fc71mdcPg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.2.tgz#b39ddab8f0be539a880bdff7bc3307d9596a545d" - integrity sha512-JAf8LceHL5SUDBYRZ2BTpfIBRc4xyhE+9uo4ZqXXstLpJUUoaW2WlTSCNlBakSlR9k4Fprk9RjqVcrpNuWN+ew== +"@abp/select2@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.3.tgz#bdb8de1fcc5c9964233fdf1d4b88f7b90099f293" + integrity sha512-yk4CDpgksM5pAXMgFnULlgDovBk0oeXRhAA6lpt0TizzJ353WkpcASUblHbWOePzXbJFBBB2cj3XBD9vdWx7Ig== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.2.tgz#1ddb2caf2e82b6f0faa3420beda8a491c51fb1df" - integrity sha512-JSV33EVAK7y1VaYQf9HBLFjVkfUHvb3aeIta/xu0Wbw17JyJHrjlk/H0Z4ihkjPcCU2CDqVJCUUzhjdFFjHNag== +"@abp/sweetalert2@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.3.tgz#54a2d45ddbdaa2f7a4485aa5731f2fec65a9c771" + integrity sha512-Lbw6S+xTNMtHeFaMJNbYTMtqznDwRtlN4+f+hRGWbqNIpHuMfTi1jUgdeZTYRjbhY+RTduUJrs8lvvPMKWgrTw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.2.tgz#cb85f15a06cb85f82cdfa0c1454b20258014f613" - integrity sha512-jjUI+R4vRe/k9I2In5tp9PNKsf1quldVZA16vKRfxkF8TrN05RBF9ks5H+zlbe//okVCVl1Gz5MVt3XP7arEig== +"@abp/timeago@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.3.tgz#6e13a178d67e635ebe65d01db220d09f1673bafa" + integrity sha512-mBwaioPVnIeMXP6tDG24NZaTCAGvk8cMah8ems3OLWNK+tsPU4Jy8BVHTSmd/7rA69EL0REuSw2GmiCvaCL+RQ== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" timeago "^1.6.7" -"@abp/toastr@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.2.tgz#f714ff89267d5e375fa2c0c8bef40f3eeacedfe8" - integrity sha512-9ZTSo+4X4cuLdfOwGBWACMS4/379BulFsMW5kcDxFWW/EYhQ2ieE/CclYMeiOqeIL92rmurdVMHeum0MSH6hbg== +"@abp/toastr@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.3.tgz#a3d2d19963fe96da9566a0f320c7f9911901e69a" + integrity sha512-F1FJPQ0nnu/jZY4XpJFS7uFJgpoEl8aOeFkm6kvshK76ABFLvsWHYW88htW5gXIwOf+G/QClZdx39Os+IQaUJw== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" toastr "^2.1.4" -"@abp/utils@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.2.tgz#03111ac799363db8948cc4b905b7eea437b01fb3" - integrity sha512-ZPrhzl+NiCXxudIv+XozMzwiIWM70AQo8VXl9el8pYiQH0oiEOcT4ny+VmWdMU/94ouW0F3h1cjpYGeJSUWO/w== +"@abp/utils@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.3.tgz#b47f11cb9a0ac963a7f4e5a44360d933e19896fc" + integrity sha512-owTYsROGHfXuHTOFe1uKMAwLbgjzQLKDnmApUy4taYy93rWsu98vFXX6rYJTK7U/X8nZq5y0BtH4covHyfsAxQ== dependencies: just-compare "^1.3.0" diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorManager.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorManager.cs index e1f597b85a..9b08236cae 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorManager.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorManager.cs @@ -66,7 +66,9 @@ public class SettingPageContributorManager : IScopedDependency if (available) { var requiredTenantSideFeatures = contributor.GetRequiredFeatures(MultiTenancySides.Tenant); - if (requiredTenantSideFeatures.Any() && !await featureChecker.IsEnabledAsync(true, requiredTenantSideFeatures.ToArray())) + if (requiredTenantSideFeatures.Any() && + ServiceProvider.GetRequiredService().IsAvailable && + !await featureChecker.IsEnabledAsync(true, requiredTenantSideFeatures.ToArray())) { available = false; } 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 4c1c7c74b7..e051b732d0 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": "^5.3.2", - "@abp/virtual-file-explorer": "^5.3.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.3", + "@abp/virtual-file-explorer": "^5.3.3" } } 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 2a1c70efdc..2200271840 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,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.2.tgz#d0798086ffcad7d0e58c1127cb212012c97f5c9f" - integrity sha512-FJeTr7ePMvBrMN018qWDjhT7xcmNgIBjes6XkE1V7h8Tc6Wyn5aBvXrrqEr1v4FbKm214t1VQy7NudIjMF/UFw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.2.tgz#7ffe5199d7df25b043919592edfbd15c5033acd6" - integrity sha512-8C6QTUqKfi2wCGo+uSZi4tEtPog/E/+F+jBDfT8tFj3eZ8UFZXwYFGUKKt/m1KsVCJ0ItHj1FxKSlpvgadcmtg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.2" - "@abp/bootstrap" "~5.3.2" - "@abp/bootstrap-datepicker" "~5.3.2" - "@abp/datatables.net-bs5" "~5.3.2" - "@abp/font-awesome" "~5.3.2" - "@abp/jquery-form" "~5.3.2" - "@abp/jquery-validation-unobtrusive" "~5.3.2" - "@abp/lodash" "~5.3.2" - "@abp/luxon" "~5.3.2" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.2" - "@abp/select2" "~5.3.2" - "@abp/sweetalert2" "~5.3.2" - "@abp/timeago" "~5.3.2" - "@abp/toastr" "~5.3.2" - -"@abp/aspnetcore.mvc.ui@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.2.tgz#59c8ba140898260c0e1f0612f135af17bd5ae146" - integrity sha512-o12lXWhckLsvYn7xmlOgsUot0WVc/Mljfrf/HIpyzntW1jL0aqGgnG4bNVDlF77fXiPlwK/7WpwHKugqXMPOPQ== +"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.3.tgz#dc6a1bdd583ef5ea0f8a0110753b0869d5f1cb61" + integrity sha512-det7xCtVZK6Dmvr0ENAkYdE+jRW0cVi3BCKZc7c6Hy0VKsKsKlnyz5j/D2rJSAmrap9hyQSWXBJUiho8W92wUQ== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.3" + +"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.3.tgz#65f97d787647e7760bb0c2a5b0f0ff815dc9630a" + integrity sha512-p/Z++QPM7S2lm7obXsZXIarcw0Y88y/Ghy5hyZqdc3uNHL6j8LRlD2qfuRXzl0k9HytXa859UKtSMLSZij1DiA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~5.3.3" + "@abp/bootstrap" "~5.3.3" + "@abp/bootstrap-datepicker" "~5.3.3" + "@abp/datatables.net-bs5" "~5.3.3" + "@abp/font-awesome" "~5.3.3" + "@abp/jquery-form" "~5.3.3" + "@abp/jquery-validation-unobtrusive" "~5.3.3" + "@abp/lodash" "~5.3.3" + "@abp/luxon" "~5.3.3" + "@abp/malihu-custom-scrollbar-plugin" "~5.3.3" + "@abp/select2" "~5.3.3" + "@abp/sweetalert2" "~5.3.3" + "@abp/timeago" "~5.3.3" + "@abp/toastr" "~5.3.3" + +"@abp/aspnetcore.mvc.ui@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.3.tgz#b8beb98bde3e4f0340335014ced7653c7913a621" + integrity sha512-aDQxdfQmlEXIjWGW8wru58imh9cncHAijafvdXlmyfKHM2JfnSSCG/RPMiaoJq/iyDVEggbhx8z4VHODC1eitg== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,171 +41,171 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.2.tgz#065b6d5b4dc484ed4c34c01209d319027e8967ea" - integrity sha512-uA2g1sThLIvGwirbLWLxExw46jnC63jjjs8aO5qSOrGrGfT6XB1OLgnnOPdFacZqPjYneGZ7ULXvOzGh2SsBYQ== +"@abp/bootstrap-datepicker@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.3.tgz#66bf2be128e6389877ed4465149c1933ca182c71" + integrity sha512-w/gPj4BVzVnmwekWVHKPYkwnhZFFH1XtCtw5LeJVM5bSYQBrvVTvvUPdKiiTDV59OYf2sbsA+PscwcTWAG6t/Q== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.2.tgz#7b2663b1d5b0ba8cd079dfb020e26b01fced3118" - integrity sha512-tdbzywiDnbsjNdOY0QBGYD/AtgchGSY7JQZoYczN9Rk4IZr7Axy1Dkw3sP/UBOQrxIOdUGlTEg2bi0MzAmTTig== +"@abp/bootstrap@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.3.tgz#56335b46bd42fba0a522712fbb6591fb6aeb5b68" + integrity sha512-xOtC690pE+QxZYhhQrpTE1rapEjg9BrJg7e0qvrkt4TLMZ4mIbau6/Qlh6x8uuMASCUUuRTLNUzHijxvOJh7Mg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" bootstrap "^5.1.3" -"@abp/clipboard@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-5.3.2.tgz#f1c00a66b3bbe46459b8f022fd54c098a9504673" - integrity sha512-e9TvKtBziGCmWw+lysqvd5CxqaIT2+L5anAx4xujiZR6EnBApLLqprlJyH7yAsxI4LJcKdBA+oj65xBtjVOm3w== +"@abp/clipboard@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-5.3.3.tgz#62c3c12f1ff503091924f672f71a50e2e5d0b47c" + integrity sha512-FRJPM9/P3WPuK4Id1KVfmpkOB3MrlrYp/beNqZtjqQuG8WDjVgnHrDnsPYfzeLdK5n6bEvtGWwtHwiaBOXhWZg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" clipboard "^2.0.8" -"@abp/core@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.2.tgz#f16026cdfd993c78904a5afe6642b5da8fbc6707" - integrity sha512-kCS8XtL2UyqYavWYGN8SY2A9PKdY5fJxKBEB6GMin4v6LzJB8f7auomLY+gFJs0PjG2rYcyT7sgVijNlOs4ypg== +"@abp/core@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.3.tgz#b03fc281d650d483c9276591f2adb26ea43dcd1e" + integrity sha512-Pp8U+LjchtSxc9lTRaPNQhb+Eh7X2LVERmZvoWyET0y/st28PJZ4eZ4iyGmV00pEmCpadF5aTWVhJcGH32scdQ== dependencies: - "@abp/utils" "~5.3.2" + "@abp/utils" "~5.3.3" -"@abp/datatables.net-bs5@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.2.tgz#bcccfe383ea271f845d25134307c2b407a513c33" - integrity sha512-MTaJW8LKvxOqzWFqmSZP3RcI3ygzB9sC8gH6J3ayILIXuMR+MjWe2OEMYAAQaT/582pME1wHtbp/dthkz6cmRQ== +"@abp/datatables.net-bs5@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.3.tgz#e00304fbe7e6d9d33e1082485f7aa07de48fac0c" + integrity sha512-dkbP3PPkMRJqxravYO7NIVww+MQC3FxHP7mPCg/+PG/LttaNJ5L5hoNcb7BMK2K76hBRMdvlSIzvjycb1w1ooA== dependencies: - "@abp/datatables.net" "~5.3.2" + "@abp/datatables.net" "~5.3.3" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.2.tgz#870959555907cad03dbcb8b3866f2be4aea7a16e" - integrity sha512-7F3dCqBmBzm8h6cM1tl8JG1eras7GaSbDKqJY3CqVCnDgJsk1O966p0VrZjWBxWKJrCoQCDX7+vid9UJlo/1aw== +"@abp/datatables.net@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.3.tgz#6d8eca1034e26708b9adf0d5917aefd5772cbf30" + integrity sha512-1JuXMzHDtrvGRNBYdwEVobiYmhd7VxM432ciARX8hzvSkE0jcgzeTrSlBXfenFMPOIAUJsSOE4YVshtqrY0G4g== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.2.tgz#2ae82288e1c4d664b673d2d7ec264f05fac98d7a" - integrity sha512-ZXNbI+U++Kz73FAEtWCc6KMZYQehqOQCSPEC4AfpYptK6fQ4weTARWzdfWcXluNSPeBtdl3Of+IR4TRjjUEyPA== +"@abp/font-awesome@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.3.tgz#b10a530c9dee28838536746ea2a40342ff2ee3a8" + integrity sha512-c+cvsQ1uolSoyTkM9rZYYM07iiq/Zu8zKOQaDbitQMfPkcfSnC3PG/PTNauSYuwh/SyFfacFXeaDQ5Y/kAGRLw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.2.tgz#0dc63c9b546a4aef4967fad90e6cd010aae976fa" - integrity sha512-S6lWlz32RgZj+ETrg214kOm5++HNiW4ftNRP4DMbwkq3dHvRvHqywdmVLfwaRciAsYpGqu0fl6T4P2WHiPRw2w== +"@abp/jquery-form@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.3.tgz#94234207aa991e098e49e7d1244dc86d289a48e6" + integrity sha512-TY5c4ODfSidYGWqUR+QMNbxasfSufSg9gLY8lTEaJn2Wd2+o3GlauPxlTeNIRCRsxqb8e5+fBJspq1YbtE8vQg== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.2.tgz#91a393a24ab60fce366c65ba23bddf36411da7cb" - integrity sha512-8V99Oaff6P7dQ46klCcl/CmC1OY6MJ43SyUnOltRCVeIodga8wK8rgvJFM5tYZQVmIdNtdxrUziNMw611N+3Uw== +"@abp/jquery-validation-unobtrusive@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.3.tgz#03f776807b60f32d2470c3d3c975ee20f33a993d" + integrity sha512-BNa2oSOfc5CSLW62SLCOinP7ybDDSVjfn0LYdDOdkIpSPnoL/3E1ZmgEzkDCUdTfJ67320kGDtIHCpb+Wbik+Q== dependencies: - "@abp/jquery-validation" "~5.3.2" + "@abp/jquery-validation" "~5.3.3" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.2.tgz#18a0f7ca797adebe9393732a62251760f34f66f0" - integrity sha512-uokx6CKtHlu8WCe3YogPi+24KG15hOi7vvtiwvwZ2dV9rJpbAnDYnq7NLwjh1JFlRGsPp8vpLi9m9zilKf1CDg== +"@abp/jquery-validation@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.3.tgz#a0544428b94966f35d3aebb40c354d3f4485137d" + integrity sha512-GFhrS4pVmbQRI0eiW2aBYmRTB0rR2s3Wj4NIVB69ZHwvy+uADA3M/oMs8Q4wuT+gmPu2GCjPNCc5RPsC173VPA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.2.tgz#add343f7a69a2bad7f7195a616ea4fd75abcb223" - integrity sha512-s8yfkAY1xRRc/WHkrC0mDJAW3j28b/w0EMIKv+IKi6xOExqZ9/PxWDC7HIdHt3lTvHf3I9jHumypZwNyC4PP1A== +"@abp/jquery@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.3.tgz#be70aa671129fac192b8f858a973e65018960cbd" + integrity sha512-sUy0aquZPq+HyxChYJMTjUZxaTo5/Aav5JcbMq1RczIFidjOrFHthWnYZveDVSKryaCfX3tXutag1sPakUOTtg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" jquery "~3.6.0" -"@abp/lodash@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.2.tgz#b3bfc70be099aae436badb4840a1f9715af5db36" - integrity sha512-IkeNEy8uiONy3VoHS7FVIL/bQVzTD1prmRMJ78dYNP8Qn317pG5/NEOgJXbka0zqR/mb2gXDg13kwlffsJWWlw== +"@abp/lodash@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.3.tgz#365684a338ab5d68adffa93207d0035eaa494ef9" + integrity sha512-Lqb2DkmKBPBHNbUd1QeATv8G/qUPamd06bKbe7xHesX3DZtlIwTmimwTpV4tqmJqOLKB67uUtapPYCfKyxs1RQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" lodash "^4.17.21" -"@abp/luxon@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.2.tgz#4d6039505d13edb30ef8b2f00bca69639cd2afd2" - integrity sha512-uxym895NuCsi5KE7JwiL2d+MnJMXZIu8xCutb0NtT89BvfjeZnAv8FOr4NjaYg+pmxTyj1i9RmBzfYsz0yvmkQ== +"@abp/luxon@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.3.tgz#97a60ae64e865d2b1c04107302d4ec50d4e09217" + integrity sha512-/7Lb463HREBFlt17tUFinTpYxfbZ8UIi1+d7Fqp8spJv78qCxvpWmD4iuJJJdCExO00ztZWY9GkCDPrAbfP/dA== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.2.tgz#99188d4b6497384720cf7168c909d32a39eff8a4" - integrity sha512-d2UcBQt4w7VqZdJjdb+JJpp9mFli7WbK7SrRTUeIINdKo3x4nrABbuKUgMBNxkroDVi1ErI0I4gwsVAGrMUPFw== +"@abp/malihu-custom-scrollbar-plugin@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.3.tgz#96be03f79be929b1a2cb67acb38e9d6638f04f15" + integrity sha512-hr5qmcVl+Wr6sIS10QerWRTfFvhmhq9e48G9Hx5oQZFjrIkfJRlxla0TYViHR2tRYCeDQGb4gYmN4Fc71mdcPg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/prismjs@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-5.3.2.tgz#76299d4eec3a41d518738bc0a94dc74e61552481" - integrity sha512-QwIGhUjWCWAi9lqrMIMEybjGM1WkADAFFhLB9R+Nk5Cj4dlgVe1PekypbWV0e3r300H6ZqJmgPcagKVG3G4bWg== +"@abp/prismjs@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-5.3.3.tgz#eccea1469cb4dfc15b87704d267bb36ad6f25758" + integrity sha512-XC0jQa9LqcuqpciDKSbc0wRo4sOK9sebX6eZBlbOnGIoHhNNbiwG0Vt60MHQ5DmaOz7k5jWP0gOISQMJ5GJfTw== dependencies: - "@abp/clipboard" "~5.3.2" - "@abp/core" "~5.3.2" + "@abp/clipboard" "~5.3.3" + "@abp/core" "~5.3.3" prismjs "^1.26.0" -"@abp/select2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.2.tgz#b39ddab8f0be539a880bdff7bc3307d9596a545d" - integrity sha512-JAf8LceHL5SUDBYRZ2BTpfIBRc4xyhE+9uo4ZqXXstLpJUUoaW2WlTSCNlBakSlR9k4Fprk9RjqVcrpNuWN+ew== +"@abp/select2@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.3.tgz#bdb8de1fcc5c9964233fdf1d4b88f7b90099f293" + integrity sha512-yk4CDpgksM5pAXMgFnULlgDovBk0oeXRhAA6lpt0TizzJ353WkpcASUblHbWOePzXbJFBBB2cj3XBD9vdWx7Ig== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.2.tgz#1ddb2caf2e82b6f0faa3420beda8a491c51fb1df" - integrity sha512-JSV33EVAK7y1VaYQf9HBLFjVkfUHvb3aeIta/xu0Wbw17JyJHrjlk/H0Z4ihkjPcCU2CDqVJCUUzhjdFFjHNag== +"@abp/sweetalert2@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.3.tgz#54a2d45ddbdaa2f7a4485aa5731f2fec65a9c771" + integrity sha512-Lbw6S+xTNMtHeFaMJNbYTMtqznDwRtlN4+f+hRGWbqNIpHuMfTi1jUgdeZTYRjbhY+RTduUJrs8lvvPMKWgrTw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~5.3.3" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.2.tgz#cb85f15a06cb85f82cdfa0c1454b20258014f613" - integrity sha512-jjUI+R4vRe/k9I2In5tp9PNKsf1quldVZA16vKRfxkF8TrN05RBF9ks5H+zlbe//okVCVl1Gz5MVt3XP7arEig== +"@abp/timeago@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.3.tgz#6e13a178d67e635ebe65d01db220d09f1673bafa" + integrity sha512-mBwaioPVnIeMXP6tDG24NZaTCAGvk8cMah8ems3OLWNK+tsPU4Jy8BVHTSmd/7rA69EL0REuSw2GmiCvaCL+RQ== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" timeago "^1.6.7" -"@abp/toastr@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.2.tgz#f714ff89267d5e375fa2c0c8bef40f3eeacedfe8" - integrity sha512-9ZTSo+4X4cuLdfOwGBWACMS4/379BulFsMW5kcDxFWW/EYhQ2ieE/CclYMeiOqeIL92rmurdVMHeum0MSH6hbg== +"@abp/toastr@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.3.tgz#a3d2d19963fe96da9566a0f320c7f9911901e69a" + integrity sha512-F1FJPQ0nnu/jZY4XpJFS7uFJgpoEl8aOeFkm6kvshK76ABFLvsWHYW88htW5gXIwOf+G/QClZdx39Os+IQaUJw== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~5.3.3" toastr "^2.1.4" -"@abp/utils@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.2.tgz#03111ac799363db8948cc4b905b7eea437b01fb3" - integrity sha512-ZPrhzl+NiCXxudIv+XozMzwiIWM70AQo8VXl9el8pYiQH0oiEOcT4ny+VmWdMU/94ouW0F3h1cjpYGeJSUWO/w== +"@abp/utils@~5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.3.tgz#b47f11cb9a0ac963a7f4e5a44360d933e19896fc" + integrity sha512-owTYsROGHfXuHTOFe1uKMAwLbgjzQLKDnmApUy4taYy93rWsu98vFXX6rYJTK7U/X8nZq5y0BtH4covHyfsAxQ== dependencies: just-compare "^1.3.0" -"@abp/virtual-file-explorer@^5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/virtual-file-explorer/-/virtual-file-explorer-5.3.2.tgz#9c88886e2cfa612636013916ca93a44a171e16ec" - integrity sha512-8itIyplAXSnLuyRBwFAg63d3fJg8XMbPjlD944BlCHd+aqbUcygXMTxZBb3HGd10mT6k8OTNrkJ96vzaxML0Qg== +"@abp/virtual-file-explorer@^5.3.3": + version "5.3.3" + resolved "https://registry.yarnpkg.com/@abp/virtual-file-explorer/-/virtual-file-explorer-5.3.3.tgz#c83619a4651af943ac720e6c3a74d1dd5f05d9ac" + integrity sha512-nDnxzcSaEXuJ6jdLuM4VzkJE0w2h8p8AcskambQx0uYGe9+JqKOyu7rXre6le1A7T0f0j+mWQ8aidkyhDuoAkA== dependencies: - "@abp/clipboard" "~5.3.2" - "@abp/prismjs" "~5.3.2" + "@abp/clipboard" "~5.3.3" + "@abp/prismjs" "~5.3.3" "@fortawesome/fontawesome-free@^5.15.4": version "5.15.4" diff --git a/npm/lerna.json b/npm/lerna.json index c8e1500717..adc2ff5ac1 100644 --- a/npm/lerna.json +++ b/npm/lerna.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "5.3.3", "packages": [ "packs/*" ], diff --git a/npm/ng-packs/lerna.version.json b/npm/ng-packs/lerna.version.json index c96e86635a..fc0832ff37 100644 --- a/npm/ng-packs/lerna.version.json +++ b/npm/ng-packs/lerna.version.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "5.3.3", "packages": [ "packages/*" ], diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 70423ebc3a..1798f45594 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -38,7 +38,7 @@ }, "private": true, "devDependencies": { - "@abp/utils": "~5.3.2", + "@abp/utils": "~5.3.3", "@angular-devkit/build-angular": "13.3.5", "@angular-devkit/build-ng-packagr": "^0.1002.0", "@angular-devkit/schematics-cli": "~12.2.0", @@ -57,17 +57,17 @@ "@angular/platform-browser": "13.3.6", "@angular/platform-browser-dynamic": "13.3.6", "@angular/router": "13.3.6", - "@abp/ng.account": "~5.3.2", - "@abp/ng.account.core": "~5.3.2", - "@abp/ng.core": "~5.3.2", - "@abp/ng.feature-management": "~5.3.2", - "@abp/ng.identity": "~5.3.2", - "@abp/ng.permission-management": "~5.3.2", - "@abp/ng.schematics": "~5.3.2", - "@abp/ng.setting-management": "~5.3.2", - "@abp/ng.tenant-management": "~5.3.2", - "@abp/ng.theme.basic": "~5.3.2", - "@abp/ng.theme.shared": "~5.3.2", + "@abp/ng.account": "~5.3.3", + "@abp/ng.account.core": "~5.3.3", + "@abp/ng.core": "~5.3.3", + "@abp/ng.feature-management": "~5.3.3", + "@abp/ng.identity": "~5.3.3", + "@abp/ng.permission-management": "~5.3.3", + "@abp/ng.schematics": "~5.3.3", + "@abp/ng.setting-management": "~5.3.3", + "@abp/ng.tenant-management": "~5.3.3", + "@abp/ng.theme.basic": "~5.3.3", + "@abp/ng.theme.shared": "~5.3.3", "@fortawesome/fontawesome-free": "^5.15.4", "@ng-bootstrap/ng-bootstrap": "~12.0.0-beta.4", "@ngneat/spectator": "^10.0.0", diff --git a/npm/ng-packs/packages/account-core/package.json b/npm/ng-packs/packages/account-core/package.json index 62772b2ee2..0ebfbb0b55 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": "5.3.2", + "version": "5.3.3", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "peerDependencies": { - "@abp/ng.core": "~5.3.2", - "@abp/ng.theme.shared": "~5.3.2", + "@abp/ng.core": "~5.3.3", + "@abp/ng.theme.shared": "~5.3.3", "@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 21431ce4b4..f528c541b5 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": "5.3.2", + "version": "5.3.3", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.account.core": "~5.3.2", - "@abp/ng.theme.shared": "~5.3.2", + "@abp/ng.account.core": "~5.3.3", + "@abp/ng.theme.shared": "~5.3.3", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/components/package.json b/npm/ng-packs/packages/components/package.json index 397e70a888..d62faa06d4 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": "5.3.2", + "version": "5.3.3", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "peerDependencies": { - "@abp/ng.core": ">=5.3.2", - "@abp/ng.theme.shared": ">=5.3.2", + "@abp/ng.core": ">=5.3.3", + "@abp/ng.theme.shared": ">=5.3.3", "@ng-bootstrap/ng-bootstrap": ">=10.0.0" }, "dependencies": { diff --git a/npm/ng-packs/packages/core/package.json b/npm/ng-packs/packages/core/package.json index 7d08fcfeeb..f82669b12f 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": "5.3.2", + "version": "5.3.3", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/utils": "~5.3.2", + "@abp/utils": "~5.3.3", "angular-oauth2-oidc": "^13.0.1", "just-clone": "^3.2.1", "just-compare": "^1.4.0", diff --git a/npm/ng-packs/packages/feature-management/package.json b/npm/ng-packs/packages/feature-management/package.json index 67fbbfbce1..aa5dcc822f 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": "5.3.2", + "version": "5.3.3", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~5.3.2", + "@abp/ng.theme.shared": "~5.3.3", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/identity/package.json b/npm/ng-packs/packages/identity/package.json index d6d32b3c77..ee0e610e33 100644 --- a/npm/ng-packs/packages/identity/package.json +++ b/npm/ng-packs/packages/identity/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.identity", - "version": "5.3.2", + "version": "5.3.3", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.permission-management": "~5.3.2", - "@abp/ng.theme.shared": "~5.3.2", + "@abp/ng.permission-management": "~5.3.3", + "@abp/ng.theme.shared": "~5.3.3", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/permission-management/package.json b/npm/ng-packs/packages/permission-management/package.json index 763e685359..ee8a3aed8d 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": "5.3.2", + "version": "5.3.3", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~5.3.2", + "@abp/ng.theme.shared": "~5.3.3", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/schematics/package.json b/npm/ng-packs/packages/schematics/package.json index 0167508daf..c7ec460ffe 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": "5.3.2", + "version": "5.3.3", "description": "Schematics that works with ABP Backend", "keywords": [ "schematics" diff --git a/npm/ng-packs/packages/setting-management/package.json b/npm/ng-packs/packages/setting-management/package.json index 97fce0cf04..f051b7e297 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": "5.3.2", + "version": "5.3.3", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.components": "~5.3.2", - "@abp/ng.theme.shared": "~5.3.2", + "@abp/ng.components": "~5.3.3", + "@abp/ng.theme.shared": "~5.3.3", "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 78e9d6906a..ede0dce957 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": "5.3.2", + "version": "5.3.3", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.feature-management": "~5.3.2", - "@abp/ng.theme.shared": "~5.3.2", + "@abp/ng.feature-management": "~5.3.3", + "@abp/ng.theme.shared": "~5.3.3", "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 e8b8ffa7b5..9b01eb5ed3 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": "5.3.2", + "version": "5.3.3", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.account.core": "~5.3.2", - "@abp/ng.theme.shared": "~5.3.2", + "@abp/ng.account.core": "~5.3.3", + "@abp/ng.theme.shared": "~5.3.3", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/theme-shared/package.json b/npm/ng-packs/packages/theme-shared/package.json index 9759d43d7e..825c9cb339 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": "5.3.2", + "version": "5.3.3", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.core": "~5.3.2", + "@abp/ng.core": "~5.3.3", "@fortawesome/fontawesome-free": "^5.15.4", "@ng-bootstrap/ng-bootstrap": "~12.0.0-beta.4", "@ngx-validate/core": "^0.1.2", diff --git a/npm/ng-packs/scripts/copy-packages-to-templates.ts b/npm/ng-packs/scripts/copy-packages-to-templates.ts new file mode 100644 index 0000000000..c611c1109a --- /dev/null +++ b/npm/ng-packs/scripts/copy-packages-to-templates.ts @@ -0,0 +1,82 @@ +import execa from 'execa'; +import fse from 'fs-extra'; +import fs from 'fs'; + +const templates = ['app', 'app-nolayers', 'module']; +const packageMap = { + account: 'ng.account', + 'account-core': 'ng.account.core', + components: 'ng.components', + core: 'ng.core', + 'feature-management': 'ng.feature-management', + identity: 'ng.identity', + 'permission-management': 'ng.permission-management', + 'setting-management': 'ng.setting-management', + 'tenant-management': 'ng.tenant-management', + 'theme-basic': 'ng.theme.basic', + 'theme-shared': 'ng.theme.shared', +}; + +(async () => { + await execa('yarn', ['build'], { + stdout: 'inherit', + }); + + await installPackages(); + + await removeAbpPackages(); + + await copyBuildedPackagesFromDistFolder(); +})(); + +async function runEachTemplate( + handler: (template: string, templatePath?: string) => void | Promise, +) { + for (var template of templates) { + const templatePath = `../../../templates/${template}/angular`; + const result = handler(template, templatePath); + result instanceof Promise ? await result : result; + } +} + +async function installPackages() { + await runEachTemplate(async (template, templatePath) => { + if (fse.existsSync(`${templatePath}/yarn.lock`)) { + fse.removeSync(`${templatePath}/yarn.lock`); + } + await execa('yarn', ['install', '--ignore-scripts'], { + stdout: 'inherit', + cwd: templatePath, + }); + }); +} + +async function removeAbpPackages() { + await runEachTemplate(async (template, templatePath) => { + Object.values(packageMap).forEach(value => { + const path = `${templatePath}/node_modules/@abp/${value}`; + if (fs.existsSync(path)) { + fse.removeSync(path); + } + }); + if (fs.existsSync(`${templatePath}/.angular`)) { + fse.removeSync(`${templatePath}/.angular`); + } + }); +} +function createFolderIfNotExists(destination: string) { + destination.split('/').reduce((acc, dir) => { + if (!fs.existsSync(acc)) { + fs.mkdirSync(acc); + } + return `${acc}/${dir}`; + }); +} +async function copyBuildedPackagesFromDistFolder() { + await runEachTemplate(async (template, templatePath) => { + Object.entries(packageMap).forEach(([key, value]) => { + createFolderIfNotExists(`${templatePath}/node_modules/@abp/${value}`); + fse.copySync(`../dist/packages/${key}/`, `${templatePath}/node_modules/@abp/${value}`); + }); + }); +} diff --git a/npm/ng-packs/scripts/package.json b/npm/ng-packs/scripts/package.json index b0961239bb..8f82f88cc9 100644 --- a/npm/ng-packs/scripts/package.json +++ b/npm/ng-packs/scripts/package.json @@ -8,7 +8,8 @@ "build:prod": "ts-node -r tsconfig-paths/register prod-build.ts", "build:schematics": "ts-node -r tsconfig-paths/register build-schematics.ts", "publish-packages": "ts-node -r tsconfig-paths/register publish.ts", - "replace-with-tilde": "ts-node -r tsconfig-paths/register replace-with-tilde.ts" + "replace-with-tilde": "ts-node -r tsconfig-paths/register replace-with-tilde.ts", + "copy-to-templates": "ts-node -r tsconfig-paths/register copy-packages-to-templates.ts" }, "author": "", "dependencies": { diff --git a/npm/packs/anchor-js/package.json b/npm/packs/anchor-js/package.json index 56280258af..dffd75f01c 100644 --- a/npm/packs/anchor-js/package.json +++ b/npm/packs/anchor-js/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/anchor-js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~5.3.3", "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 9f7bc7ee34..fe0a682fd1 100644 --- a/npm/packs/aspnetcore.components.server.basictheme/package.json +++ b/npm/packs/aspnetcore.components.server.basictheme/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/aspnetcore.components.server.basictheme", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/aspnetcore.components.server.theming": "~5.3.2" + "@abp/aspnetcore.components.server.theming": "~5.3.3" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/aspnetcore.components.server.theming/package.json b/npm/packs/aspnetcore.components.server.theming/package.json index 2b8e940a13..b5acb5f662 100644 --- a/npm/packs/aspnetcore.components.server.theming/package.json +++ b/npm/packs/aspnetcore.components.server.theming/package.json @@ -1,12 +1,12 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/aspnetcore.components.server.theming", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/bootstrap": "~5.3.2", - "@abp/font-awesome": "~5.3.2" + "@abp/bootstrap": "~5.3.3", + "@abp/font-awesome": "~5.3.3" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json index 774b1c3556..2dce8485d7 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": "5.3.2", + "version": "5.3.3", "name": "@abp/aspnetcore.mvc.ui.theme.basic", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~5.3.2" + "@abp/aspnetcore.mvc.ui.theme.shared": "~5.3.3" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json index c0f1299088..480cb0b3fc 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": "5.3.2", + "version": "5.3.3", "name": "@abp/aspnetcore.mvc.ui.theme.shared", "repository": { "type": "git", @@ -10,20 +10,20 @@ "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui": "~5.3.2", - "@abp/bootstrap": "~5.3.2", - "@abp/bootstrap-datepicker": "~5.3.2", - "@abp/datatables.net-bs5": "~5.3.2", - "@abp/font-awesome": "~5.3.2", - "@abp/jquery-form": "~5.3.2", - "@abp/jquery-validation-unobtrusive": "~5.3.2", - "@abp/lodash": "~5.3.2", - "@abp/luxon": "~5.3.2", - "@abp/malihu-custom-scrollbar-plugin": "~5.3.2", - "@abp/select2": "~5.3.2", - "@abp/sweetalert2": "~5.3.2", - "@abp/timeago": "~5.3.2", - "@abp/toastr": "~5.3.2" + "@abp/aspnetcore.mvc.ui": "~5.3.3", + "@abp/bootstrap": "~5.3.3", + "@abp/bootstrap-datepicker": "~5.3.3", + "@abp/datatables.net-bs5": "~5.3.3", + "@abp/font-awesome": "~5.3.3", + "@abp/jquery-form": "~5.3.3", + "@abp/jquery-validation-unobtrusive": "~5.3.3", + "@abp/lodash": "~5.3.3", + "@abp/luxon": "~5.3.3", + "@abp/malihu-custom-scrollbar-plugin": "~5.3.3", + "@abp/select2": "~5.3.3", + "@abp/sweetalert2": "~5.3.3", + "@abp/timeago": "~5.3.3", + "@abp/toastr": "~5.3.3" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/aspnetcore.mvc.ui/package-lock.json b/npm/packs/aspnetcore.mvc.ui/package-lock.json index f61f3d0d00..0f185e72ce 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": "5.3.2", + "version": "5.3.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/npm/packs/aspnetcore.mvc.ui/package.json b/npm/packs/aspnetcore.mvc.ui/package.json index ccb8ca9169..7cee754cd4 100644 --- a/npm/packs/aspnetcore.mvc.ui/package.json +++ b/npm/packs/aspnetcore.mvc.ui/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/aspnetcore.mvc.ui", "repository": { "type": "git", diff --git a/npm/packs/blogging/package.json b/npm/packs/blogging/package.json index 6cbfc3e8df..b24d4a05a2 100644 --- a/npm/packs/blogging/package.json +++ b/npm/packs/blogging/package.json @@ -1,14 +1,14 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/blogging", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~5.3.2", - "@abp/owl.carousel": "~5.3.2", - "@abp/prismjs": "~5.3.2", - "@abp/tui-editor": "~5.3.2" + "@abp/aspnetcore.mvc.ui.theme.shared": "~5.3.3", + "@abp/owl.carousel": "~5.3.3", + "@abp/prismjs": "~5.3.3", + "@abp/tui-editor": "~5.3.3" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/bootstrap-datepicker/package.json b/npm/packs/bootstrap-datepicker/package.json index 7699c656c5..94c1856632 100644 --- a/npm/packs/bootstrap-datepicker/package.json +++ b/npm/packs/bootstrap-datepicker/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/bootstrap-datepicker", "repository": { "type": "git", diff --git a/npm/packs/bootstrap/package.json b/npm/packs/bootstrap/package.json index cd6b2d558a..114ebf5db5 100644 --- a/npm/packs/bootstrap/package.json +++ b/npm/packs/bootstrap/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/bootstrap", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~5.3.3", "bootstrap": "^5.1.3" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/chart.js/package.json b/npm/packs/chart.js/package.json index c7412fc877..eb09f1b427 100644 --- a/npm/packs/chart.js/package.json +++ b/npm/packs/chart.js/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/chart.js", "publishConfig": { "access": "public" diff --git a/npm/packs/clipboard/package.json b/npm/packs/clipboard/package.json index dfcd74f1ce..e3722da71f 100644 --- a/npm/packs/clipboard/package.json +++ b/npm/packs/clipboard/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/clipboard", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~5.3.3", "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 f529128439..43bd6d1447 100644 --- a/npm/packs/cms-kit.admin/package.json +++ b/npm/packs/cms-kit.admin/package.json @@ -1,15 +1,15 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/cms-kit.admin", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/codemirror": "~5.3.2", - "@abp/jstree": "~5.3.2", - "@abp/slugify": "~5.3.2", - "@abp/tui-editor": "~5.3.2", - "@abp/uppy": "~5.3.2" + "@abp/codemirror": "~5.3.3", + "@abp/jstree": "~5.3.3", + "@abp/slugify": "~5.3.3", + "@abp/tui-editor": "~5.3.3", + "@abp/uppy": "~5.3.3" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/cms-kit.public/package.json b/npm/packs/cms-kit.public/package.json index 7899f52de9..df18c56c54 100644 --- a/npm/packs/cms-kit.public/package.json +++ b/npm/packs/cms-kit.public/package.json @@ -1,12 +1,12 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/cms-kit.public", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/highlight.js": "~5.3.2", - "@abp/star-rating-svg": "~5.3.2" + "@abp/highlight.js": "~5.3.3", + "@abp/star-rating-svg": "~5.3.3" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/cms-kit/package.json b/npm/packs/cms-kit/package.json index 5b706a1323..cf294e0880 100644 --- a/npm/packs/cms-kit/package.json +++ b/npm/packs/cms-kit/package.json @@ -1,12 +1,12 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/cms-kit", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/cms-kit.admin": "~5.3.2", - "@abp/cms-kit.public": "~5.3.2" + "@abp/cms-kit.admin": "~5.3.3", + "@abp/cms-kit.public": "~5.3.3" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/codemirror/package.json b/npm/packs/codemirror/package.json index 10c15ed4b9..34d31a7aa9 100644 --- a/npm/packs/codemirror/package.json +++ b/npm/packs/codemirror/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/codemirror", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~5.3.3", "codemirror": "^5.65.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/core/package.json b/npm/packs/core/package.json index c75a08f123..01b04e0cb8 100644 --- a/npm/packs/core/package.json +++ b/npm/packs/core/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/core", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/utils": "~5.3.2" + "@abp/utils": "~5.3.3" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/core/src/abp.js b/npm/packs/core/src/abp.js index b028c013d6..0348069bec 100644 --- a/npm/packs/core/src/abp.js +++ b/npm/packs/core/src/abp.js @@ -372,7 +372,9 @@ var abp = abp || {}; setTimeout(function () { if (element) { element.classList.remove('abp-block-area-disappearing'); - element.parentElement.removeChild(element); + if (element.parentElement) { + element.parentElement.removeChild(element); + } } }, 250); } diff --git a/npm/packs/cropperjs/package.json b/npm/packs/cropperjs/package.json index fbbceeb9e4..8db8df9a43 100644 --- a/npm/packs/cropperjs/package.json +++ b/npm/packs/cropperjs/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/cropperjs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~5.3.3", "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 e1b4469da4..8b50ef0c8f 100644 --- a/npm/packs/datatables.net-bs4/package.json +++ b/npm/packs/datatables.net-bs4/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/datatables.net-bs4", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/datatables.net": "~5.3.2", + "@abp/datatables.net": "~5.3.3", "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 1970b5c21d..13c728cacc 100644 --- a/npm/packs/datatables.net-bs5/package.json +++ b/npm/packs/datatables.net-bs5/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/datatables.net-bs5", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/datatables.net": "~5.3.2", + "@abp/datatables.net": "~5.3.3", "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 44d335170a..6e2beba898 100644 --- a/npm/packs/datatables.net/package.json +++ b/npm/packs/datatables.net/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/datatables.net", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.2", + "@abp/jquery": "~5.3.3", "datatables.net": "^1.11.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/docs/package.json b/npm/packs/docs/package.json index a01dff4329..62b08eb06b 100644 --- a/npm/packs/docs/package.json +++ b/npm/packs/docs/package.json @@ -1,15 +1,15 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/docs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/anchor-js": "~5.3.2", - "@abp/clipboard": "~5.3.2", - "@abp/malihu-custom-scrollbar-plugin": "~5.3.2", - "@abp/popper.js": "~5.3.2", - "@abp/prismjs": "~5.3.2" + "@abp/anchor-js": "~5.3.3", + "@abp/clipboard": "~5.3.3", + "@abp/malihu-custom-scrollbar-plugin": "~5.3.3", + "@abp/popper.js": "~5.3.3", + "@abp/prismjs": "~5.3.3" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/flag-icon-css/package.json b/npm/packs/flag-icon-css/package.json index 6d0a9dc950..0335336794 100644 --- a/npm/packs/flag-icon-css/package.json +++ b/npm/packs/flag-icon-css/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/flag-icon-css", "publishConfig": { "access": "public" diff --git a/npm/packs/font-awesome/package.json b/npm/packs/font-awesome/package.json index 58e889b236..fcbe50cd67 100644 --- a/npm/packs/font-awesome/package.json +++ b/npm/packs/font-awesome/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/font-awesome", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~5.3.3", "@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 326b13b5fe..d01ba44299 100644 --- a/npm/packs/highlight.js/package.json +++ b/npm/packs/highlight.js/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/highlight.js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~5.3.3", "@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 8e641d523e..79c31c5258 100644 --- a/npm/packs/jquery-form/package.json +++ b/npm/packs/jquery-form/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/jquery-form", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.2", + "@abp/jquery": "~5.3.3", "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 c3a0d438d1..fd062c3bdd 100644 --- a/npm/packs/jquery-validation-unobtrusive/package.json +++ b/npm/packs/jquery-validation-unobtrusive/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/jquery-validation-unobtrusive", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery-validation": "~5.3.2", + "@abp/jquery-validation": "~5.3.3", "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 d0ca2237c3..431e33c965 100644 --- a/npm/packs/jquery-validation/package.json +++ b/npm/packs/jquery-validation/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/jquery-validation", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.2", + "@abp/jquery": "~5.3.3", "jquery-validation": "^1.19.3" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/jquery/package.json b/npm/packs/jquery/package.json index c074764e84..0235b146fe 100644 --- a/npm/packs/jquery/package.json +++ b/npm/packs/jquery/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/jquery", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~5.3.3", "jquery": "~3.6.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/jstree/package.json b/npm/packs/jstree/package.json index 99eba24040..1a0cf850ca 100644 --- a/npm/packs/jstree/package.json +++ b/npm/packs/jstree/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/jstree", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.2", + "@abp/jquery": "~5.3.3", "jstree": "^3.3.12" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/lodash/package.json b/npm/packs/lodash/package.json index 2685ea1fc7..f662fdc435 100644 --- a/npm/packs/lodash/package.json +++ b/npm/packs/lodash/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/lodash", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~5.3.3", "lodash": "^4.17.21" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/luxon/package.json b/npm/packs/luxon/package.json index 73cbcab589..fdff4d4f10 100644 --- a/npm/packs/luxon/package.json +++ b/npm/packs/luxon/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/luxon", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~5.3.3", "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 15f58c7fb4..21795b0183 100644 --- a/npm/packs/malihu-custom-scrollbar-plugin/package.json +++ b/npm/packs/malihu-custom-scrollbar-plugin/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/malihu-custom-scrollbar-plugin", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~5.3.3", "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 212f7ddfc2..160b6dbc8c 100644 --- a/npm/packs/markdown-it/package.json +++ b/npm/packs/markdown-it/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/markdown-it", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~5.3.3", "markdown-it": "^12.3.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/owl.carousel/package.json b/npm/packs/owl.carousel/package.json index 0d56ef1afd..bff1ca0e92 100644 --- a/npm/packs/owl.carousel/package.json +++ b/npm/packs/owl.carousel/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/owl.carousel", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~5.3.3", "owl.carousel": "^2.3.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/popper.js/package.json b/npm/packs/popper.js/package.json index 350cfa1845..7d276c50f3 100644 --- a/npm/packs/popper.js/package.json +++ b/npm/packs/popper.js/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/popper.js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~5.3.3", "@popperjs/core": "^2.11.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/prismjs/package.json b/npm/packs/prismjs/package.json index 534b5653ac..50cb5f72bc 100644 --- a/npm/packs/prismjs/package.json +++ b/npm/packs/prismjs/package.json @@ -1,12 +1,12 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/prismjs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/clipboard": "~5.3.2", - "@abp/core": "~5.3.2", + "@abp/clipboard": "~5.3.3", + "@abp/core": "~5.3.3", "prismjs": "^1.26.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/select2/package.json b/npm/packs/select2/package.json index 81e80b5948..deb5b6837f 100644 --- a/npm/packs/select2/package.json +++ b/npm/packs/select2/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/select2", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~5.3.3", "select2": "^4.0.13" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/signalr/package.json b/npm/packs/signalr/package.json index 0bee3d64ea..3de0512203 100644 --- a/npm/packs/signalr/package.json +++ b/npm/packs/signalr/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/signalr", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~5.3.3", "@microsoft/signalr": "~6.0.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/slugify/package.json b/npm/packs/slugify/package.json index 6222775de1..5e3c7693a1 100644 --- a/npm/packs/slugify/package.json +++ b/npm/packs/slugify/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "5.3.3", "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 0e22d5277c..c2467e72fe 100644 --- a/npm/packs/star-rating-svg/package.json +++ b/npm/packs/star-rating-svg/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/star-rating-svg", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.2", + "@abp/jquery": "~5.3.3", "star-rating-svg": "^3.5.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/sweetalert2/package.json b/npm/packs/sweetalert2/package.json index 0266c4cbfa..fccf68a900 100644 --- a/npm/packs/sweetalert2/package.json +++ b/npm/packs/sweetalert2/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/sweetalert2", "publishConfig": { "access": "public" @@ -10,7 +10,7 @@ "directory": "npm/packs/sweetalert2" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~5.3.3", "sweetalert2": "^11.3.6" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/timeago/package.json b/npm/packs/timeago/package.json index ed69589969..4338fce963 100644 --- a/npm/packs/timeago/package.json +++ b/npm/packs/timeago/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/timeago", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.2", + "@abp/jquery": "~5.3.3", "timeago": "^1.6.7" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/toastr/package.json b/npm/packs/toastr/package.json index fa29a4a52c..637b90440a 100644 --- a/npm/packs/toastr/package.json +++ b/npm/packs/toastr/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/toastr", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.2", + "@abp/jquery": "~5.3.3", "toastr": "^2.1.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/tui-editor/package.json b/npm/packs/tui-editor/package.json index a55fdf9517..3c1fb38d02 100644 --- a/npm/packs/tui-editor/package.json +++ b/npm/packs/tui-editor/package.json @@ -1,12 +1,12 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/tui-editor", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.2", - "@abp/prismjs": "~5.3.2" + "@abp/jquery": "~5.3.3", + "@abp/prismjs": "~5.3.3" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/uppy/package.json b/npm/packs/uppy/package.json index 4a3f23eeee..a1d87027cd 100644 --- a/npm/packs/uppy/package.json +++ b/npm/packs/uppy/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/uppy", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~5.3.3", "uppy": "^1.16.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/utils/package.json b/npm/packs/utils/package.json index 858e26d203..7719548588 100644 --- a/npm/packs/utils/package.json +++ b/npm/packs/utils/package.json @@ -1,6 +1,6 @@ { "name": "@abp/utils", - "version": "5.3.2", + "version": "5.3.3", "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 985de8d8b0..fe08c38595 100644 --- a/npm/packs/vee-validate/package.json +++ b/npm/packs/vee-validate/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/vee-validate", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/vue": "~5.3.2", + "@abp/vue": "~5.3.3", "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 29d7cf9cdb..72599b591d 100644 --- a/npm/packs/virtual-file-explorer/package.json +++ b/npm/packs/virtual-file-explorer/package.json @@ -1,12 +1,12 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/virtual-file-explorer", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/clipboard": "~5.3.2", - "@abp/prismjs": "~5.3.2" + "@abp/clipboard": "~5.3.3", + "@abp/prismjs": "~5.3.3" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/vue/package.json b/npm/packs/vue/package.json index e681e9c921..c9fa28e7ba 100644 --- a/npm/packs/vue/package.json +++ b/npm/packs/vue/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "5.3.3", "name": "@abp/vue", "publishConfig": { "access": "public" diff --git a/templates/app-nolayers/angular/package.json b/templates/app-nolayers/angular/package.json index 7233a43d86..bbf74f6761 100644 --- a/templates/app-nolayers/angular/package.json +++ b/templates/app-nolayers/angular/package.json @@ -12,14 +12,14 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~5.3.2", - "@abp/ng.components": "~5.3.2", - "@abp/ng.core": "~5.3.2", - "@abp/ng.identity": "~5.3.2", - "@abp/ng.setting-management": "~5.3.2", - "@abp/ng.tenant-management": "~5.3.2", - "@abp/ng.theme.shared": "~5.3.2", - "@abp/ng.theme.lepton-x": "~1.0.0-beta.4", + "@abp/ng.account": "~5.3.3", + "@abp/ng.components": "~5.3.3", + "@abp/ng.core": "~5.3.3", + "@abp/ng.identity": "~5.3.3", + "@abp/ng.setting-management": "~5.3.3", + "@abp/ng.tenant-management": "~5.3.3", + "@abp/ng.theme.shared": "~5.3.3", + "@abp/ng.theme.lepton-x": "~1.0.0-rc.1", "@angular/animations": "~13.1.1", "@angular/common": "~13.1.1", "@angular/compiler": "~13.1.1", @@ -35,7 +35,7 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@abp/ng.schematics": "~5.3.2", + "@abp/ng.schematics": "~5.3.3", "@angular-devkit/build-angular": "~13.1.2", "@angular-eslint/builder": "~13.0.1", "@angular-eslint/eslint-plugin": "~13.0.1", diff --git a/templates/app-nolayers/angular/src/styles.scss b/templates/app-nolayers/angular/src/styles.scss index dbc4332587..efe57bd8c3 100644 --- a/templates/app-nolayers/angular/src/styles.scss +++ b/templates/app-nolayers/angular/src/styles.scss @@ -24,9 +24,3 @@ transform: translate(-50%, -50%); } } - -:root { - --lpx-logo: url('/assets/images/logo.png'); - --lpx-logo-icon: url('/assets/images/logo-icon.png'); - --lpx-brand: #edae53; -} \ No newline at end of file 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 2ea2c5e519..af31d6b3b0 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 @@ -15,14 +15,14 @@ - - - - - + + + + + - - + + @@ -63,10 +63,10 @@ - - - - + + + + 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 2538ee5062..101e95a5a6 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,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0-beta.4" + "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0-rc.1" } } 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 86386f8820..9525771603 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 @@ -15,14 +15,14 @@ - - - - - + + + + + - - + + @@ -64,10 +64,10 @@ - - - - + + + + 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 af7e05763d..30b73b111f 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": "^1.0.0-beta.4", - "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0-beta.4" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-rc.1", + "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0-rc.1" } } 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 af736c6462..afd7cf01cf 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 @@ -48,9 +48,9 @@ - - - + + + @@ -65,11 +65,11 @@ - - - + + + - + 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 d31c1fd4e3..de039528aa 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": "~1.0.0-beta.4" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0-rc.1" } } 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 058fedbafe..9b9817c9a6 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 @@ -49,9 +49,9 @@ - - - + + + @@ -66,11 +66,11 @@ - - - + + + - + 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 d31c1fd4e3..de039528aa 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": "~1.0.0-beta.4" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0-rc.1" } } 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 fca4376859..10e8b24a06 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 @@ -13,11 +13,11 @@ - - - + + + - + @@ -58,10 +58,10 @@ - - - - + + + + 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 d31c1fd4e3..de039528aa 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": "~1.0.0-beta.4" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0-rc.1" } } 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 0bb0076d1e..4c48cc7a23 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 @@ -13,11 +13,11 @@ - - - + + + - + @@ -59,10 +59,10 @@ - - - - + + + + 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 d31c1fd4e3..de039528aa 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": "~1.0.0-beta.4" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0-rc.1" } } diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index 1e349446f1..1020b00571 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -12,14 +12,14 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~5.3.2", - "@abp/ng.components": "~5.3.2", - "@abp/ng.core": "~5.3.2", - "@abp/ng.identity": "~5.3.2", - "@abp/ng.setting-management": "~5.3.2", - "@abp/ng.tenant-management": "~5.3.2", - "@abp/ng.theme.shared": "~5.3.2", - "@abp/ng.theme.lepton-x": "~1.0.0-beta.4", + "@abp/ng.account": "~5.3.3", + "@abp/ng.components": "~5.3.3", + "@abp/ng.core": "~5.3.3", + "@abp/ng.identity": "~5.3.3", + "@abp/ng.setting-management": "~5.3.3", + "@abp/ng.tenant-management": "~5.3.3", + "@abp/ng.theme.shared": "~5.3.3", + "@abp/ng.theme.lepton-x": "~1.0.0-rc.1", "@angular/animations": "~13.3.3", "@angular/common": "~13.3.3", "@angular/compiler": "~13.3.3", @@ -35,7 +35,7 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@abp/ng.schematics": "~5.3.2", + "@abp/ng.schematics": "~5.3.3", "@angular-devkit/build-angular": "~13.3.3", "@angular-eslint/builder": "~13.2.1", "@angular-eslint/eslint-plugin": "~13.2.1", diff --git a/templates/app/angular/src/styles.scss b/templates/app/angular/src/styles.scss index 14d29fc69b..efe57bd8c3 100644 --- a/templates/app/angular/src/styles.scss +++ b/templates/app/angular/src/styles.scss @@ -24,9 +24,3 @@ transform: translate(-50%, -50%); } } - -:root { - --lpx-logo: url('/assets/images/logo.png'); - --lpx-logo-icon: url('/assets/images/logo-icon.png'); - --lpx-brand: #edae53; -} \ 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 7233cae7c8..2fa421b562 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 @@ -42,7 +42,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 f6604f05f5..a86e6094e2 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": "^1.0.0-beta.4" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-rc.1" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/yarn.lock index 2a82e25892..2b23fd7903 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/yarn.lock +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-beta.4": - version "1.0.0-beta.4" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-beta.4.tgz#dfd12fcd93a4443407990e0106c9112a059af216" - integrity sha1-39EvzZOkRDQHmQ4BBskRKgWa8hY= - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220630" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220630": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220706.tgz#11d5307c38e3b541a591d2d055689f8738d2c2da" - integrity sha1-EdUwfDjjtUGlkdLQVWifhzjSwto= - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220706" - "@abp/bootstrap" "~6.0.0-preview20220706" - "@abp/bootstrap-datepicker" "~6.0.0-preview20220706" - "@abp/datatables.net-bs5" "~6.0.0-preview20220706" - "@abp/font-awesome" "~6.0.0-preview20220706" - "@abp/jquery-form" "~6.0.0-preview20220706" - "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220706" - "@abp/lodash" "~6.0.0-preview20220706" - "@abp/luxon" "~6.0.0-preview20220706" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220706" - "@abp/select2" "~6.0.0-preview20220706" - "@abp/sweetalert2" "~6.0.0-preview20220706" - "@abp/timeago" "~6.0.0-preview20220706" - "@abp/toastr" "~6.0.0-preview20220706" - -"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220706.tgz#98c9070508f2eab900ef3ec3f07fa9fbe7abc1cf" - integrity sha1-mMkHBQjy6rkA7z7D8H+p++erwc8= +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-rc.1": + version "1.0.0-rc.1" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-rc.1.tgz#a10e11bd3516748d54999a7a9f0f5260920cf92f" + integrity sha1-oQ4RvTUWdI1UmZp6nw9SYJIM+S8= + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220719" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220719": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220720.tgz#8eadc3b3689ab81badf8bf4f69876dd21b4472c2" + integrity sha1-jq3Ds2iauBut+L9PaYdt0htEcsI= + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220720" + "@abp/bootstrap" "~6.0.0-preview20220720" + "@abp/bootstrap-datepicker" "~6.0.0-preview20220720" + "@abp/datatables.net-bs5" "~6.0.0-preview20220720" + "@abp/font-awesome" "~6.0.0-preview20220720" + "@abp/jquery-form" "~6.0.0-preview20220720" + "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220720" + "@abp/lodash" "~6.0.0-preview20220720" + "@abp/luxon" "~6.0.0-preview20220720" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220720" + "@abp/select2" "~6.0.0-preview20220720" + "@abp/sweetalert2" "~6.0.0-preview20220720" + "@abp/timeago" "~6.0.0-preview20220720" + "@abp/toastr" "~6.0.0-preview20220720" + +"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220720.tgz#86d45510348f194533c7bbcfe669256f60f0ec71" + integrity sha1-htRVEDSPGUUzx7vP5mklb2Dw7HE= dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220706.tgz#c0e067f669a5e9a793c064cd36bfc44ed6eca57b" - integrity sha1-wOBn9mml6aeTwGTNNr/ETtbspXs= +"@abp/bootstrap-datepicker@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220720.tgz#e0c305a1260555a5adcf2d8b50852339a96845fd" + integrity sha1-4MMFoSYFVaWtzy2LUIUjOaloRf0= dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220706.tgz#cac892165484c07248a384857eccacea69f301da" - integrity sha1-ysiSFlSEwHJIo4SFfsys6mnzAdo= +"@abp/bootstrap@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220720.tgz#0eab26a14dc434bc3f79da32f8c68b98b774c142" + integrity sha1-DqsmoU3ENLw/edoy+MaLmLd0wUI= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" bootstrap "^5.1.3" -"@abp/core@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220706.tgz#d53152cc92f4d969de21ea7bfa9e7a2fa7d5b8c3" - integrity sha1-1TFSzJL02WneIep7+p56L6fVuMM= +"@abp/core@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220720.tgz#a8197318482a74c847e4c359d77e106f625731fc" + integrity sha1-qBlzGEgqdMhH5MNZ134Qb2JXMfw= dependencies: - "@abp/utils" "~6.0.0-preview20220706" + "@abp/utils" "~6.0.0-preview20220720" -"@abp/datatables.net-bs5@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220706.tgz#73000a07a63c54910750c41f101d667c3d694407" - integrity sha1-cwAKB6Y8VJEHUMQfEB1mfD1pRAc= +"@abp/datatables.net-bs5@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220720.tgz#940315f5409721dc5c09d08d291bdd5c81b9777d" + integrity sha1-lAMV9UCXIdxcCdCNKRvdXIG5d30= dependencies: - "@abp/datatables.net" "~6.0.0-preview20220706" + "@abp/datatables.net" "~6.0.0-preview20220720" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220706.tgz#803785b6c56c03f50d99e102f3afab8b105ec1ef" - integrity sha1-gDeFtsVsA/UNmeEC86+rixBewe8= +"@abp/datatables.net@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220720.tgz#34aa416ac0fdd97961be8f946ba6536bd264f6bd" + integrity sha1-NKpBasD92Xlhvo+Ua6ZTa9Jk9r0= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220706.tgz#df58f0167513aba5b71c467ba14d1601400da6c2" - integrity sha1-31jwFnUTq6W3HEZ7oU0WAUANpsI= +"@abp/font-awesome@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220720.tgz#cbba37b3b3a0c659bada8133f6911c90b86fa6e7" + integrity sha1-y7o3s7Ogxlm62oEz9pEckLhvpuc= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220706.tgz#bc47253029b5120bd35a0e885acdc7ac2a64ef37" - integrity sha1-vEclMCm1EgvTWg6IWs3HrCpk7zc= +"@abp/jquery-form@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220720.tgz#f6dd53204faa99225ea92f1996431bb90cfeb17e" + integrity sha1-9t1TIE+qmSJeqS8ZlkMbuQz+sX4= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220706.tgz#089ac5c4614268cd67c1f3e97702dfed3de2d99d" - integrity sha1-CJrFxGFCaM1nwfPpdwLf7T3i2Z0= +"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220720.tgz#aa7f16ea28aa8c7445d71856a51f592541744982" + integrity sha1-qn8W6iiqjHRF1xhWpR9ZJUF0SYI= dependencies: - "@abp/jquery-validation" "~6.0.0-preview20220706" + "@abp/jquery-validation" "~6.0.0-preview20220720" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220706.tgz#f9ca93f8c3c05f429b5cba17f373ccefbe742685" - integrity sha1-+cqT+MPAX0KbXLoX83PM7750JoU= +"@abp/jquery-validation@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220720.tgz#4af78971bbe6ef17e110916656c64cf438a8ec3f" + integrity sha1-SveJcbvm7xfhEJFmVsZM9Dio7D8= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220706.tgz#ca0b243122ea73e52302e554fba738e7f4e6478b" - integrity sha1-ygskMSLqc+UjAuVU+6c45/TmR4s= +"@abp/jquery@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220720.tgz#b24a4dd4cd167c82d694e9849beb72afcd1ffb79" + integrity sha1-skpN1M0WfILWlOmEm+tyr80f+3k= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" jquery "~3.6.0" -"@abp/lodash@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220706.tgz#9fda3d6b0a3cb7af9704e9a2c4b73ca87b04f9e8" - integrity sha1-n9o9awo8t6+XBOmixLc8qHsE+eg= +"@abp/lodash@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220720.tgz#c67ebe78dcb862f84e4202baa4203245acf75791" + integrity sha1-xn6+eNy4YvhOQgK6pCAyRaz3V5E= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" lodash "^4.17.21" -"@abp/luxon@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220706.tgz#298edf10a7cc9c7753f0b2d84e077262b4fc1367" - integrity sha1-KY7fEKfMnHdT8LLYTgdyYrT8E2c= +"@abp/luxon@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220720.tgz#99eb8fc9e7c9e1c71850b562b6ec131b89e14dfb" + integrity sha1-meuPyefJ4ccYULVituwTG4nhTfs= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220706.tgz#d9cd9488f563a9118819cab997d0a31601c28578" - integrity sha1-2c2UiPVjqRGIGcq5l9CjFgHChXg= +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220720.tgz#9a9dc785a4c2ff6962c326f9aaa86d6621a3f66d" + integrity sha1-mp3HhaTC/2liwyb5qqhtZiGj9m0= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220706.tgz#283d7b82f7871d80120ddf7f152e7846fe239846" - integrity sha1-KD17gveHHYASDd9/FS54Rv4jmEY= +"@abp/select2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220720.tgz#32fed6ccedc18a98ba3d0d8f155bcd604d37864a" + integrity sha1-Mv7WzO3Bipi6PQ2PFVvNYE03hko= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220706.tgz#cc617eb7cdb2c1127155ff79ab80e7213d069bb0" - integrity sha1-zGF+t82ywRJxVf95q4DnIT0Gm7A= +"@abp/sweetalert2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220720.tgz#cdfe984653ed008173c669f3448a4a4b4e32a0e3" + integrity sha1-zf6YRlPtAIFzxmnzRIpKS04yoOM= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220706.tgz#2b676e41341b34f14fa8854f539c1a77b5427ce0" - integrity sha1-K2duQTQbNPFPqIVPU5wad7VCfOA= +"@abp/timeago@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220720.tgz#eff687139b888423b866fe6cefd8e305352be818" + integrity sha1-7/aHE5uIhCO4Zv5s79jjBTUr6Bg= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" timeago "^1.6.7" -"@abp/toastr@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220706.tgz#33708e757b8c258dce9eae2dbbbfa59f3ca557eb" - integrity sha1-M3COdXuMJY3Onq4tu7+lnzylV+s= +"@abp/toastr@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220720.tgz#bcaad9d365a46b44a290b61f921530f1c6327a93" + integrity sha1-vKrZ02Wka0SikLYfkhUw8cYyepM= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" toastr "^2.1.4" -"@abp/utils@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220706.tgz#35bfe9533ff0cb45ed64bbc99f52d50183a59173" - integrity sha1-Nb/pUz/wy0XtZLvJn1LVAYOlkXM= +"@abp/utils@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220720.tgz#82172d690ddbfb3bafa86fbf719cd9b4cc76ba2d" + integrity sha1-ghctaQ3b+zuvqG+/cZzZtMx2ui0= dependencies: just-compare "^1.3.0" 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 6540b3ca00..a5260019d1 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 @@ -28,8 +28,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 af7e05763d..30b73b111f 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": "^1.0.0-beta.4", - "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0-beta.4" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-rc.1", + "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0-rc.1" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/yarn.lock index 676a39216d..cb49aabf61 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/yarn.lock +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/yarn.lock @@ -2,52 +2,52 @@ # yarn lockfile v1 -"@abp/aspnetcore.components.server.leptonxlitetheme@^1.0.0-beta.4": - version "1.0.0-beta.4" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.components.server.leptonxlitetheme/-/@abp/aspnetcore.components.server.leptonxlitetheme-1.0.0-beta.4.tgz#43a4fa80039371b6db16165cc90733a38b3a73cc" - integrity sha1-Q6T6gAOTcbbbFhZcyQczo4s6c8w= - dependencies: - "@abp/aspnetcore.components.server.theming" "~6.0.0-preview20220630" - -"@abp/aspnetcore.components.server.theming@~6.0.0-preview20220630": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.components.server.theming/-/@abp/aspnetcore.components.server.theming-6.0.0-preview20220706.tgz#7bbd388922143c5957d96acad1322b7c63520316" - integrity sha1-e704iSIUPFlX2WrK0TIrfGNSAxY= - dependencies: - "@abp/bootstrap" "~6.0.0-preview20220706" - "@abp/font-awesome" "~6.0.0-preview20220706" - -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-beta.4": - version "1.0.0-beta.4" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-beta.4.tgz#dfd12fcd93a4443407990e0106c9112a059af216" - integrity sha1-39EvzZOkRDQHmQ4BBskRKgWa8hY= - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220630" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220630": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220706.tgz#11d5307c38e3b541a591d2d055689f8738d2c2da" - integrity sha1-EdUwfDjjtUGlkdLQVWifhzjSwto= - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220706" - "@abp/bootstrap" "~6.0.0-preview20220706" - "@abp/bootstrap-datepicker" "~6.0.0-preview20220706" - "@abp/datatables.net-bs5" "~6.0.0-preview20220706" - "@abp/font-awesome" "~6.0.0-preview20220706" - "@abp/jquery-form" "~6.0.0-preview20220706" - "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220706" - "@abp/lodash" "~6.0.0-preview20220706" - "@abp/luxon" "~6.0.0-preview20220706" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220706" - "@abp/select2" "~6.0.0-preview20220706" - "@abp/sweetalert2" "~6.0.0-preview20220706" - "@abp/timeago" "~6.0.0-preview20220706" - "@abp/toastr" "~6.0.0-preview20220706" - -"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220706.tgz#98c9070508f2eab900ef3ec3f07fa9fbe7abc1cf" - integrity sha1-mMkHBQjy6rkA7z7D8H+p++erwc8= +"@abp/aspnetcore.components.server.leptonxlitetheme@^1.0.0-rc.1": + version "1.0.0-rc.1" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.components.server.leptonxlitetheme/-/@abp/aspnetcore.components.server.leptonxlitetheme-1.0.0-rc.1.tgz#a40d6191a275e5fbb20918e5fabfd6b97b3f815b" + integrity sha1-pA1hkaJ15fuyCRjl+r/WuXs/gVs= + dependencies: + "@abp/aspnetcore.components.server.theming" "~6.0.0-preview20220719" + +"@abp/aspnetcore.components.server.theming@~6.0.0-preview20220719": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.components.server.theming/-/@abp/aspnetcore.components.server.theming-6.0.0-preview20220720.tgz#dc5cb8994b7de42f889414982cbc1f5b9fff482c" + integrity sha1-3Fy4mUt95C+IlBSYLLwfW5//SCw= + dependencies: + "@abp/bootstrap" "~6.0.0-preview20220720" + "@abp/font-awesome" "~6.0.0-preview20220720" + +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-rc.1": + version "1.0.0-rc.1" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-rc.1.tgz#a10e11bd3516748d54999a7a9f0f5260920cf92f" + integrity sha1-oQ4RvTUWdI1UmZp6nw9SYJIM+S8= + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220719" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220719": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220720.tgz#8eadc3b3689ab81badf8bf4f69876dd21b4472c2" + integrity sha1-jq3Ds2iauBut+L9PaYdt0htEcsI= + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220720" + "@abp/bootstrap" "~6.0.0-preview20220720" + "@abp/bootstrap-datepicker" "~6.0.0-preview20220720" + "@abp/datatables.net-bs5" "~6.0.0-preview20220720" + "@abp/font-awesome" "~6.0.0-preview20220720" + "@abp/jquery-form" "~6.0.0-preview20220720" + "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220720" + "@abp/lodash" "~6.0.0-preview20220720" + "@abp/luxon" "~6.0.0-preview20220720" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220720" + "@abp/select2" "~6.0.0-preview20220720" + "@abp/sweetalert2" "~6.0.0-preview20220720" + "@abp/timeago" "~6.0.0-preview20220720" + "@abp/toastr" "~6.0.0-preview20220720" + +"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220720.tgz#86d45510348f194533c7bbcfe669256f60f0ec71" + integrity sha1-htRVEDSPGUUzx7vP5mklb2Dw7HE= dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -56,144 +56,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220706.tgz#c0e067f669a5e9a793c064cd36bfc44ed6eca57b" - integrity sha1-wOBn9mml6aeTwGTNNr/ETtbspXs= +"@abp/bootstrap-datepicker@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220720.tgz#e0c305a1260555a5adcf2d8b50852339a96845fd" + integrity sha1-4MMFoSYFVaWtzy2LUIUjOaloRf0= dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220706.tgz#cac892165484c07248a384857eccacea69f301da" - integrity sha1-ysiSFlSEwHJIo4SFfsys6mnzAdo= +"@abp/bootstrap@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220720.tgz#0eab26a14dc434bc3f79da32f8c68b98b774c142" + integrity sha1-DqsmoU3ENLw/edoy+MaLmLd0wUI= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" bootstrap "^5.1.3" -"@abp/core@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220706.tgz#d53152cc92f4d969de21ea7bfa9e7a2fa7d5b8c3" - integrity sha1-1TFSzJL02WneIep7+p56L6fVuMM= +"@abp/core@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220720.tgz#a8197318482a74c847e4c359d77e106f625731fc" + integrity sha1-qBlzGEgqdMhH5MNZ134Qb2JXMfw= dependencies: - "@abp/utils" "~6.0.0-preview20220706" + "@abp/utils" "~6.0.0-preview20220720" -"@abp/datatables.net-bs5@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220706.tgz#73000a07a63c54910750c41f101d667c3d694407" - integrity sha1-cwAKB6Y8VJEHUMQfEB1mfD1pRAc= +"@abp/datatables.net-bs5@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220720.tgz#940315f5409721dc5c09d08d291bdd5c81b9777d" + integrity sha1-lAMV9UCXIdxcCdCNKRvdXIG5d30= dependencies: - "@abp/datatables.net" "~6.0.0-preview20220706" + "@abp/datatables.net" "~6.0.0-preview20220720" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220706.tgz#803785b6c56c03f50d99e102f3afab8b105ec1ef" - integrity sha1-gDeFtsVsA/UNmeEC86+rixBewe8= +"@abp/datatables.net@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220720.tgz#34aa416ac0fdd97961be8f946ba6536bd264f6bd" + integrity sha1-NKpBasD92Xlhvo+Ua6ZTa9Jk9r0= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220706.tgz#df58f0167513aba5b71c467ba14d1601400da6c2" - integrity sha1-31jwFnUTq6W3HEZ7oU0WAUANpsI= +"@abp/font-awesome@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220720.tgz#cbba37b3b3a0c659bada8133f6911c90b86fa6e7" + integrity sha1-y7o3s7Ogxlm62oEz9pEckLhvpuc= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220706.tgz#bc47253029b5120bd35a0e885acdc7ac2a64ef37" - integrity sha1-vEclMCm1EgvTWg6IWs3HrCpk7zc= +"@abp/jquery-form@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220720.tgz#f6dd53204faa99225ea92f1996431bb90cfeb17e" + integrity sha1-9t1TIE+qmSJeqS8ZlkMbuQz+sX4= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220706.tgz#089ac5c4614268cd67c1f3e97702dfed3de2d99d" - integrity sha1-CJrFxGFCaM1nwfPpdwLf7T3i2Z0= +"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220720.tgz#aa7f16ea28aa8c7445d71856a51f592541744982" + integrity sha1-qn8W6iiqjHRF1xhWpR9ZJUF0SYI= dependencies: - "@abp/jquery-validation" "~6.0.0-preview20220706" + "@abp/jquery-validation" "~6.0.0-preview20220720" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220706.tgz#f9ca93f8c3c05f429b5cba17f373ccefbe742685" - integrity sha1-+cqT+MPAX0KbXLoX83PM7750JoU= +"@abp/jquery-validation@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220720.tgz#4af78971bbe6ef17e110916656c64cf438a8ec3f" + integrity sha1-SveJcbvm7xfhEJFmVsZM9Dio7D8= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220706.tgz#ca0b243122ea73e52302e554fba738e7f4e6478b" - integrity sha1-ygskMSLqc+UjAuVU+6c45/TmR4s= +"@abp/jquery@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220720.tgz#b24a4dd4cd167c82d694e9849beb72afcd1ffb79" + integrity sha1-skpN1M0WfILWlOmEm+tyr80f+3k= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" jquery "~3.6.0" -"@abp/lodash@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220706.tgz#9fda3d6b0a3cb7af9704e9a2c4b73ca87b04f9e8" - integrity sha1-n9o9awo8t6+XBOmixLc8qHsE+eg= +"@abp/lodash@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220720.tgz#c67ebe78dcb862f84e4202baa4203245acf75791" + integrity sha1-xn6+eNy4YvhOQgK6pCAyRaz3V5E= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" lodash "^4.17.21" -"@abp/luxon@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220706.tgz#298edf10a7cc9c7753f0b2d84e077262b4fc1367" - integrity sha1-KY7fEKfMnHdT8LLYTgdyYrT8E2c= +"@abp/luxon@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220720.tgz#99eb8fc9e7c9e1c71850b562b6ec131b89e14dfb" + integrity sha1-meuPyefJ4ccYULVituwTG4nhTfs= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220706.tgz#d9cd9488f563a9118819cab997d0a31601c28578" - integrity sha1-2c2UiPVjqRGIGcq5l9CjFgHChXg= +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220720.tgz#9a9dc785a4c2ff6962c326f9aaa86d6621a3f66d" + integrity sha1-mp3HhaTC/2liwyb5qqhtZiGj9m0= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220706.tgz#283d7b82f7871d80120ddf7f152e7846fe239846" - integrity sha1-KD17gveHHYASDd9/FS54Rv4jmEY= +"@abp/select2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220720.tgz#32fed6ccedc18a98ba3d0d8f155bcd604d37864a" + integrity sha1-Mv7WzO3Bipi6PQ2PFVvNYE03hko= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220706.tgz#cc617eb7cdb2c1127155ff79ab80e7213d069bb0" - integrity sha1-zGF+t82ywRJxVf95q4DnIT0Gm7A= +"@abp/sweetalert2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220720.tgz#cdfe984653ed008173c669f3448a4a4b4e32a0e3" + integrity sha1-zf6YRlPtAIFzxmnzRIpKS04yoOM= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220706.tgz#2b676e41341b34f14fa8854f539c1a77b5427ce0" - integrity sha1-K2duQTQbNPFPqIVPU5wad7VCfOA= +"@abp/timeago@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220720.tgz#eff687139b888423b866fe6cefd8e305352be818" + integrity sha1-7/aHE5uIhCO4Zv5s79jjBTUr6Bg= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" timeago "^1.6.7" -"@abp/toastr@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220706.tgz#33708e757b8c258dce9eae2dbbbfa59f3ca557eb" - integrity sha1-M3COdXuMJY3Onq4tu7+lnzylV+s= +"@abp/toastr@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220720.tgz#bcaad9d365a46b44a290b61f921530f1c6327a93" + integrity sha1-vKrZ02Wka0SikLYfkhUw8cYyepM= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" toastr "^2.1.4" -"@abp/utils@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220706.tgz#35bfe9533ff0cb45ed64bbc99f52d50183a59173" - integrity sha1-Nb/pUz/wy0XtZLvJn1LVAYOlkXM= +"@abp/utils@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220720.tgz#82172d690ddbfb3bafa86fbf719cd9b4cc76ba2d" + integrity sha1-ghctaQ3b+zuvqG+/cZzZtMx2ui0= dependencies: just-compare "^1.3.0" 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 f4795c2311..7f7a66ce6c 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 @@ -27,8 +27,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 af7e05763d..30b73b111f 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": "^1.0.0-beta.4", - "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0-beta.4" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-rc.1", + "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0-rc.1" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/yarn.lock index 676a39216d..cb49aabf61 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/yarn.lock +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/yarn.lock @@ -2,52 +2,52 @@ # yarn lockfile v1 -"@abp/aspnetcore.components.server.leptonxlitetheme@^1.0.0-beta.4": - version "1.0.0-beta.4" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.components.server.leptonxlitetheme/-/@abp/aspnetcore.components.server.leptonxlitetheme-1.0.0-beta.4.tgz#43a4fa80039371b6db16165cc90733a38b3a73cc" - integrity sha1-Q6T6gAOTcbbbFhZcyQczo4s6c8w= - dependencies: - "@abp/aspnetcore.components.server.theming" "~6.0.0-preview20220630" - -"@abp/aspnetcore.components.server.theming@~6.0.0-preview20220630": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.components.server.theming/-/@abp/aspnetcore.components.server.theming-6.0.0-preview20220706.tgz#7bbd388922143c5957d96acad1322b7c63520316" - integrity sha1-e704iSIUPFlX2WrK0TIrfGNSAxY= - dependencies: - "@abp/bootstrap" "~6.0.0-preview20220706" - "@abp/font-awesome" "~6.0.0-preview20220706" - -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-beta.4": - version "1.0.0-beta.4" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-beta.4.tgz#dfd12fcd93a4443407990e0106c9112a059af216" - integrity sha1-39EvzZOkRDQHmQ4BBskRKgWa8hY= - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220630" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220630": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220706.tgz#11d5307c38e3b541a591d2d055689f8738d2c2da" - integrity sha1-EdUwfDjjtUGlkdLQVWifhzjSwto= - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220706" - "@abp/bootstrap" "~6.0.0-preview20220706" - "@abp/bootstrap-datepicker" "~6.0.0-preview20220706" - "@abp/datatables.net-bs5" "~6.0.0-preview20220706" - "@abp/font-awesome" "~6.0.0-preview20220706" - "@abp/jquery-form" "~6.0.0-preview20220706" - "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220706" - "@abp/lodash" "~6.0.0-preview20220706" - "@abp/luxon" "~6.0.0-preview20220706" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220706" - "@abp/select2" "~6.0.0-preview20220706" - "@abp/sweetalert2" "~6.0.0-preview20220706" - "@abp/timeago" "~6.0.0-preview20220706" - "@abp/toastr" "~6.0.0-preview20220706" - -"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220706.tgz#98c9070508f2eab900ef3ec3f07fa9fbe7abc1cf" - integrity sha1-mMkHBQjy6rkA7z7D8H+p++erwc8= +"@abp/aspnetcore.components.server.leptonxlitetheme@^1.0.0-rc.1": + version "1.0.0-rc.1" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.components.server.leptonxlitetheme/-/@abp/aspnetcore.components.server.leptonxlitetheme-1.0.0-rc.1.tgz#a40d6191a275e5fbb20918e5fabfd6b97b3f815b" + integrity sha1-pA1hkaJ15fuyCRjl+r/WuXs/gVs= + dependencies: + "@abp/aspnetcore.components.server.theming" "~6.0.0-preview20220719" + +"@abp/aspnetcore.components.server.theming@~6.0.0-preview20220719": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.components.server.theming/-/@abp/aspnetcore.components.server.theming-6.0.0-preview20220720.tgz#dc5cb8994b7de42f889414982cbc1f5b9fff482c" + integrity sha1-3Fy4mUt95C+IlBSYLLwfW5//SCw= + dependencies: + "@abp/bootstrap" "~6.0.0-preview20220720" + "@abp/font-awesome" "~6.0.0-preview20220720" + +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-rc.1": + version "1.0.0-rc.1" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-rc.1.tgz#a10e11bd3516748d54999a7a9f0f5260920cf92f" + integrity sha1-oQ4RvTUWdI1UmZp6nw9SYJIM+S8= + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220719" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220719": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220720.tgz#8eadc3b3689ab81badf8bf4f69876dd21b4472c2" + integrity sha1-jq3Ds2iauBut+L9PaYdt0htEcsI= + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220720" + "@abp/bootstrap" "~6.0.0-preview20220720" + "@abp/bootstrap-datepicker" "~6.0.0-preview20220720" + "@abp/datatables.net-bs5" "~6.0.0-preview20220720" + "@abp/font-awesome" "~6.0.0-preview20220720" + "@abp/jquery-form" "~6.0.0-preview20220720" + "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220720" + "@abp/lodash" "~6.0.0-preview20220720" + "@abp/luxon" "~6.0.0-preview20220720" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220720" + "@abp/select2" "~6.0.0-preview20220720" + "@abp/sweetalert2" "~6.0.0-preview20220720" + "@abp/timeago" "~6.0.0-preview20220720" + "@abp/toastr" "~6.0.0-preview20220720" + +"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220720.tgz#86d45510348f194533c7bbcfe669256f60f0ec71" + integrity sha1-htRVEDSPGUUzx7vP5mklb2Dw7HE= dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -56,144 +56,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220706.tgz#c0e067f669a5e9a793c064cd36bfc44ed6eca57b" - integrity sha1-wOBn9mml6aeTwGTNNr/ETtbspXs= +"@abp/bootstrap-datepicker@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220720.tgz#e0c305a1260555a5adcf2d8b50852339a96845fd" + integrity sha1-4MMFoSYFVaWtzy2LUIUjOaloRf0= dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220706.tgz#cac892165484c07248a384857eccacea69f301da" - integrity sha1-ysiSFlSEwHJIo4SFfsys6mnzAdo= +"@abp/bootstrap@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220720.tgz#0eab26a14dc434bc3f79da32f8c68b98b774c142" + integrity sha1-DqsmoU3ENLw/edoy+MaLmLd0wUI= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" bootstrap "^5.1.3" -"@abp/core@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220706.tgz#d53152cc92f4d969de21ea7bfa9e7a2fa7d5b8c3" - integrity sha1-1TFSzJL02WneIep7+p56L6fVuMM= +"@abp/core@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220720.tgz#a8197318482a74c847e4c359d77e106f625731fc" + integrity sha1-qBlzGEgqdMhH5MNZ134Qb2JXMfw= dependencies: - "@abp/utils" "~6.0.0-preview20220706" + "@abp/utils" "~6.0.0-preview20220720" -"@abp/datatables.net-bs5@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220706.tgz#73000a07a63c54910750c41f101d667c3d694407" - integrity sha1-cwAKB6Y8VJEHUMQfEB1mfD1pRAc= +"@abp/datatables.net-bs5@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220720.tgz#940315f5409721dc5c09d08d291bdd5c81b9777d" + integrity sha1-lAMV9UCXIdxcCdCNKRvdXIG5d30= dependencies: - "@abp/datatables.net" "~6.0.0-preview20220706" + "@abp/datatables.net" "~6.0.0-preview20220720" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220706.tgz#803785b6c56c03f50d99e102f3afab8b105ec1ef" - integrity sha1-gDeFtsVsA/UNmeEC86+rixBewe8= +"@abp/datatables.net@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220720.tgz#34aa416ac0fdd97961be8f946ba6536bd264f6bd" + integrity sha1-NKpBasD92Xlhvo+Ua6ZTa9Jk9r0= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220706.tgz#df58f0167513aba5b71c467ba14d1601400da6c2" - integrity sha1-31jwFnUTq6W3HEZ7oU0WAUANpsI= +"@abp/font-awesome@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220720.tgz#cbba37b3b3a0c659bada8133f6911c90b86fa6e7" + integrity sha1-y7o3s7Ogxlm62oEz9pEckLhvpuc= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220706.tgz#bc47253029b5120bd35a0e885acdc7ac2a64ef37" - integrity sha1-vEclMCm1EgvTWg6IWs3HrCpk7zc= +"@abp/jquery-form@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220720.tgz#f6dd53204faa99225ea92f1996431bb90cfeb17e" + integrity sha1-9t1TIE+qmSJeqS8ZlkMbuQz+sX4= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220706.tgz#089ac5c4614268cd67c1f3e97702dfed3de2d99d" - integrity sha1-CJrFxGFCaM1nwfPpdwLf7T3i2Z0= +"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220720.tgz#aa7f16ea28aa8c7445d71856a51f592541744982" + integrity sha1-qn8W6iiqjHRF1xhWpR9ZJUF0SYI= dependencies: - "@abp/jquery-validation" "~6.0.0-preview20220706" + "@abp/jquery-validation" "~6.0.0-preview20220720" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220706.tgz#f9ca93f8c3c05f429b5cba17f373ccefbe742685" - integrity sha1-+cqT+MPAX0KbXLoX83PM7750JoU= +"@abp/jquery-validation@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220720.tgz#4af78971bbe6ef17e110916656c64cf438a8ec3f" + integrity sha1-SveJcbvm7xfhEJFmVsZM9Dio7D8= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220706.tgz#ca0b243122ea73e52302e554fba738e7f4e6478b" - integrity sha1-ygskMSLqc+UjAuVU+6c45/TmR4s= +"@abp/jquery@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220720.tgz#b24a4dd4cd167c82d694e9849beb72afcd1ffb79" + integrity sha1-skpN1M0WfILWlOmEm+tyr80f+3k= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" jquery "~3.6.0" -"@abp/lodash@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220706.tgz#9fda3d6b0a3cb7af9704e9a2c4b73ca87b04f9e8" - integrity sha1-n9o9awo8t6+XBOmixLc8qHsE+eg= +"@abp/lodash@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220720.tgz#c67ebe78dcb862f84e4202baa4203245acf75791" + integrity sha1-xn6+eNy4YvhOQgK6pCAyRaz3V5E= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" lodash "^4.17.21" -"@abp/luxon@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220706.tgz#298edf10a7cc9c7753f0b2d84e077262b4fc1367" - integrity sha1-KY7fEKfMnHdT8LLYTgdyYrT8E2c= +"@abp/luxon@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220720.tgz#99eb8fc9e7c9e1c71850b562b6ec131b89e14dfb" + integrity sha1-meuPyefJ4ccYULVituwTG4nhTfs= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220706.tgz#d9cd9488f563a9118819cab997d0a31601c28578" - integrity sha1-2c2UiPVjqRGIGcq5l9CjFgHChXg= +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220720.tgz#9a9dc785a4c2ff6962c326f9aaa86d6621a3f66d" + integrity sha1-mp3HhaTC/2liwyb5qqhtZiGj9m0= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220706.tgz#283d7b82f7871d80120ddf7f152e7846fe239846" - integrity sha1-KD17gveHHYASDd9/FS54Rv4jmEY= +"@abp/select2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220720.tgz#32fed6ccedc18a98ba3d0d8f155bcd604d37864a" + integrity sha1-Mv7WzO3Bipi6PQ2PFVvNYE03hko= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220706.tgz#cc617eb7cdb2c1127155ff79ab80e7213d069bb0" - integrity sha1-zGF+t82ywRJxVf95q4DnIT0Gm7A= +"@abp/sweetalert2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220720.tgz#cdfe984653ed008173c669f3448a4a4b4e32a0e3" + integrity sha1-zf6YRlPtAIFzxmnzRIpKS04yoOM= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220706.tgz#2b676e41341b34f14fa8854f539c1a77b5427ce0" - integrity sha1-K2duQTQbNPFPqIVPU5wad7VCfOA= +"@abp/timeago@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220720.tgz#eff687139b888423b866fe6cefd8e305352be818" + integrity sha1-7/aHE5uIhCO4Zv5s79jjBTUr6Bg= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" timeago "^1.6.7" -"@abp/toastr@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220706.tgz#33708e757b8c258dce9eae2dbbbfa59f3ca557eb" - integrity sha1-M3COdXuMJY3Onq4tu7+lnzylV+s= +"@abp/toastr@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220720.tgz#bcaad9d365a46b44a290b61f921530f1c6327a93" + integrity sha1-vKrZ02Wka0SikLYfkhUw8cYyepM= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" toastr "^2.1.4" -"@abp/utils@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220706.tgz#35bfe9533ff0cb45ed64bbc99f52d50183a59173" - integrity sha1-Nb/pUz/wy0XtZLvJn1LVAYOlkXM= +"@abp/utils@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220720.tgz#82172d690ddbfb3bafa86fbf719cd9b4cc76ba2d" + integrity sha1-ghctaQ3b+zuvqG+/cZzZtMx2ui0= dependencies: just-compare "^1.3.0" 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 3959c2c6a7..cb7138393f 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 @@ -23,7 +23,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/global.css b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/global.css index 8b2a2db395..25321f5ffd 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/global.css +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/global.css @@ -5516,7 +5516,9 @@ select.form-select option:checked[selected], select.form-select option:focus[sel .alert-brand { color: #686b6e; - background: rgba(247, 37, 133, 0.2); + background: rgba(247, 37, 133, 0.35); + -webkit-backdrop-filter: saturate(180%) blur(20px); + backdrop-filter: saturate(180%) blur(20px); } .alert-brand a, .alert-brand .icon, @@ -5527,7 +5529,9 @@ select.form-select option:checked[selected], select.form-select option:focus[sel .alert-primary { color: #686b6e; - background: rgba(53, 93, 255, 0.2); + background: rgba(53, 93, 255, 0.35); + -webkit-backdrop-filter: saturate(180%) blur(20px); + backdrop-filter: saturate(180%) blur(20px); } .alert-primary a, .alert-primary .icon, @@ -5538,7 +5542,9 @@ select.form-select option:checked[selected], select.form-select option:focus[sel .alert-secondary { color: #686b6e; - background: rgba(108, 93, 211, 0.2); + background: rgba(108, 93, 211, 0.35); + -webkit-backdrop-filter: saturate(180%) blur(20px); + backdrop-filter: saturate(180%) blur(20px); } .alert-secondary a, .alert-secondary .icon, @@ -5549,7 +5555,9 @@ select.form-select option:checked[selected], select.form-select option:focus[sel .alert-success { color: #686b6e; - background: rgba(79, 191, 103, 0.2); + background: rgba(79, 191, 103, 0.35); + -webkit-backdrop-filter: saturate(180%) blur(20px); + backdrop-filter: saturate(180%) blur(20px); } .alert-success a, .alert-success .icon, @@ -5560,7 +5568,9 @@ select.form-select option:checked[selected], select.form-select option:focus[sel .alert-info { color: #686b6e; - background: rgba(67, 138, 167, 0.2); + background: rgba(67, 138, 167, 0.35); + -webkit-backdrop-filter: saturate(180%) blur(20px); + backdrop-filter: saturate(180%) blur(20px); } .alert-info a, .alert-info .icon, @@ -5571,7 +5581,9 @@ select.form-select option:checked[selected], select.form-select option:focus[sel .alert-warning { color: #686b6e; - background: rgba(255, 159, 56, 0.2); + background: rgba(255, 159, 56, 0.35); + -webkit-backdrop-filter: saturate(180%) blur(20px); + backdrop-filter: saturate(180%) blur(20px); } .alert-warning a, .alert-warning .icon, @@ -5582,7 +5594,9 @@ select.form-select option:checked[selected], select.form-select option:focus[sel .alert-danger { color: #686b6e; - background: rgba(192, 13, 73, 0.2); + background: rgba(192, 13, 73, 0.35); + -webkit-backdrop-filter: saturate(180%) blur(20px); + backdrop-filter: saturate(180%) blur(20px); } .alert-danger a, .alert-danger .icon, @@ -5593,7 +5607,9 @@ select.form-select option:checked[selected], select.form-select option:focus[sel .alert-light { color: #686b6e; - background: rgba(245, 245, 247, 0.2); + background: rgba(245, 245, 247, 0.35); + -webkit-backdrop-filter: saturate(180%) blur(20px); + backdrop-filter: saturate(180%) blur(20px); } .alert-light a, .alert-light .icon, @@ -5604,7 +5620,9 @@ select.form-select option:checked[selected], select.form-select option:focus[sel .alert-dark { color: #686b6e; - background: rgba(22, 22, 22, 0.2); + background: rgba(22, 22, 22, 0.35); + -webkit-backdrop-filter: saturate(180%) blur(20px); + backdrop-filter: saturate(180%) blur(20px); } .alert-dark a, .alert-dark .icon, @@ -11922,7 +11940,7 @@ body { } } .lpx-content-container .lpx-content { - padding: 2em; + padding: 1.25em 2em 3em; max-width: 1280px; margin: 0 auto; } @@ -11948,16 +11966,16 @@ body { } .lpx-main-title { - font-size: 1.5rem !important; - font-weight: 600; + font-size: 1.25rem !important; + font-weight: 500; color: #161616; - margin-bottom: 0.75rem; - margin-top: 0.25rem; + margin-bottom: 0.875rem; + margin-top: 0.875rem; } .lpx-sidebar { background-color: #161616; - color: #777d87; + color: #9198a5; display: flex; flex-direction: column; align-items: center; @@ -12071,6 +12089,40 @@ body { } } +.lpx-nav { + padding-top: 72px; +} + +.lpx-topbar-content { + display: flex; + align-items: center; + margin-right: 0.4rem; + gap: 0.7rem; + font-size: 0.875em; +} +.lpx-topbar-content .lpx-avatar .lpx-avatar-img, +.lpx-topbar-content .lpx-avatar .lpx-avatar-icon { + height: 24px; + width: 24px; +} + +@media only screen and (min-width: 1200px) { + .lpx-footbar-container { + left: 280px; + } +} +@media only screen and (min-width: 768px) and (max-width: 1199px) { + .lpx-footbar-container { + left: 72px; + } +} + +@media only screen and (min-width: 1200px) { + #lpx-wrapper.hover-trigger .lpx-footbar-container { + left: 72px; + } +} + .lpx-avatar { justify-content: center; align-items: center; @@ -12092,33 +12144,38 @@ body { align-items: center; display: flex; font-size: 20px; - color: #777d87; + color: #9198a5; background-color: #f5f5f7; } .lpx-avatar .lpx-avatar-icon .lpx-icon { display: flex; } +.lpx-breadcrumb-wrapper { + width: 100%; + justify-content: space-between; + margin: 0 auto; +} + .lpx-breadcrumb-container { - height: 40px; + height: 30px; } .lpx-breadcrumb { display: flex; padding: 0; margin: 0; - border-radius: 16px 16px 0 0; + border-radius: 0.5rem; } .lpx-breadcrumb-item { cursor: pointer; position: relative; - font-size: 0.875em; - padding: 0 16px; + font-size: 0.725rem; + padding: 0 10px; margin: 0; - color: rgba(104, 107, 110, 0.65); transition: background-color 0.3s ease; - line-height: 40px; + line-height: 30px; } .lpx-breadcrumb-item a { color: unset; @@ -12192,10 +12249,10 @@ body { .lpx-breadcrumb-separator { font-weight: bold; - line-height: 40px; + line-height: 30px; width: 1px; overflow: hidden; - background: rgba(104, 107, 110, 0.08); + background: rgba(104, 107, 110, 0.075); } .lpx-breadcrumb-separator:last-child { display: none; @@ -12275,31 +12332,91 @@ body { } .lpx-topbar-container { - top: 0; + flex-wrap: wrap; position: sticky; + top: 0; padding: 0; background-color: #161616; z-index: 101; - flex-wrap: wrap; - -webkit-backdrop-filter: saturate(180%) blur(20px); - backdrop-filter: saturate(180%) blur(20px); + box-shadow: 0 0 20px 0 rgba(76, 87, 125, 0.02); } - -.lpx-topbar { +.lpx-topbar-container .lpx-topbar { display: flex; justify-content: space-between; + margin: 0 auto; background-color: #f5f5f7; - border-radius: 16px 16px 0 0; + border-radius: 1em 1em 0 0; padding: 0; - border-bottom: 1px solid rgba(104, 107, 110, 0.08); + border: 1px solid rgba(104, 107, 110, 0.075); } -.lpx-topbar-content { - justify-content: center; - align-items: center; +.lpx-content-wrapper { + border: 1px solid rgba(104, 107, 110, 0.075); + border-top: 0; +} + +.lpx-footbar-container { + flex-wrap: wrap; + padding: 0; + background-color: #161616; + z-index: 101; + position: fixed; + bottom: 0; + top: inherit; + right: 72px; + left: 280px; + box-shadow: 0 0 20px 0 rgba(76, 87, 125, 0.02); +} +@media only screen and (max-width: 767px) { + .lpx-footbar-container { + top: auto; + right: 0; + left: 0; + bottom: 72px; + } +} +.lpx-footbar-container .lpx-footbar { display: flex; - margin-right: 10px; - gap: 0.5rem; + justify-content: space-between; + margin: 0 auto; + background-color: #f5f5f7; + border-radius: 0 0 1em 1em; + border: 1px solid rgba(104, 107, 110, 0.075); + font-size: 0.725rem; +} +.lpx-footbar-container .lpx-footbar .lpx-footbar-solo-links { + display: flex; +} +.lpx-footbar-container .lpx-footbar .lpx-footbar-solo-links a { + border-left: 1px solid rgba(104, 107, 110, 0.075); + line-height: 30px; + color: #686b6e; + text-decoration: none; + padding: 0 1rem; + transition: color 0.2s ease; +} +.lpx-footbar-container .lpx-footbar .lpx-footbar-solo-links a:hover { + color: var(--lpx-brand); +} +.lpx-footbar-container .lpx-footbar .lpx-footbar-copyright { + color: #686b6e; + line-height: 30px; + padding-left: 1rem; + padding-right: 1rem; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} +.lpx-footbar-container .lpx-footbar .lpx-footbar-copyright span { + opacity: 0.5; +} +.lpx-footbar-container .lpx-footbar .lpx-footbar-copyright a { + color: #686b6e; + text-decoration: none; + transition: color 0.2s ease; +} +.lpx-footbar-container .lpx-footbar .lpx-footbar-copyright a:hover { + color: var(--lpx-brand); } .lpx-menu-item { @@ -12307,8 +12424,7 @@ body { } .lpx-nav { - color: #777d87; - padding-top: 72px; + color: #9198a5; } .lpx-nav .lpx-nav-menu { padding: 0 0 15px 0; @@ -12329,7 +12445,7 @@ body { display: flex; width: 100%; cursor: pointer; - color: #777d87; + color: #9198a5; height: 48px; line-height: 48px; transition: color 0.25s ease, background-color 0.3s ease; @@ -12358,12 +12474,10 @@ body { opacity: 1; } .lpx-nav-menu .lpx-menu-item-link .lpx-menu-item-icon .lpx-icon { - line-height: 1; text-align: center; display: inline-block; position: relative; width: 48px; - height: 48px; transition: all 0.25s ease; font-size: 16px; opacity: 0.86; @@ -12409,6 +12523,47 @@ body { padding-left: 84px; } +.lpx-menu-item { + cursor: pointer; + color: #9198a5; + height: 48px; + line-height: 48px; + transition: color 0.25s ease, background-color 0.3s ease; +} +.lpx-menu-item:hover { + color: #fff; +} +.lpx-menu-item:hover .lpx-menu-item-icon { + color: var(--lpx-brand); + opacity: 1; +} +.lpx-menu-item:hover .dd-icon { + color: #fff; + opacity: 1; +} +.lpx-menu-item.selected { + color: #fff; + background-color: #222; +} +.lpx-menu-item.selected .lpx-menu-item-icon, +.lpx-menu-item.selected .dd-icon { + color: var(--lpx-brand); + opacity: 1; +} +.lpx-menu-item .dd-icon { + position: absolute; + text-align: center; + opacity: 0.5; + right: 24px; + width: 24px; +} +.lpx-inner-menu-item .lpx-menu-item-link { + transition: background-color 0.5s ease, color 0.25s ease; +} +.lpx-inner-menu-item .lpx-menu-item-link.selected, .lpx-inner-menu-item .lpx-menu-item-link:hover { + background-color: #222; +} + .lpx-favorite { display: flex; align-items: center; @@ -12416,6 +12571,20 @@ body { cursor: pointer; } +.lpx-footer { + border-top: 1px solid rgba(104, 107, 110, 0.075); + font-size: 0.725rem; + color: rgba(104, 107, 110, 0.75); +} +.lpx-footer a { + padding: 0 10px; + margin: 0; + color: rgba(104, 107, 110, 0.75); + transition: background-color 0.3s ease; + line-height: 30px; + text-decoration: none; +} + .lpx-user-profile { justify-content: center; align-items: center; @@ -12456,7 +12625,7 @@ body { } .lpx-mobile-navbar .user-menu .lpx-icon { font-size: 36px; - color: #777d87; + color: #9198a5; } .lpx-mobile-navbar .lpx-logo-container { flex: 1 1 auto; @@ -12508,14 +12677,14 @@ body { color: #fff; } .user-menu-groups .action { - color: #777d87; + color: #9198a5; display: block; } .user-menu-groups .divider { height: 0; margin: 0.5rem 0; overflow: hidden; - border-top: 1px solid rgba(119, 125, 135, 0.3); + border-top: 1px solid rgba(145, 152, 165, 0.3); } .user-menu-groups .action-group-menu { padding: 12px 0; diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/index.html b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/index.html index 41f4f96726..97aa0ac121 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/index.html +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/index.html @@ -8,7 +8,7 @@ - + @@ -29,7 +29,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 7598200938..4ee3eb11f7 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 @@ -25,7 +25,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 0de071371b..b0b2ecbefe 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": "^1.0.0-beta.4" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-rc.1" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/yarn.lock index 7be9ba3d55..c3e2752356 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/yarn.lock +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-beta.4": - version "1.0.0-beta.4" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-beta.4.tgz#dfd12fcd93a4443407990e0106c9112a059af216" - integrity sha1-39EvzZOkRDQHmQ4BBskRKgWa8hY= - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220630" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220630": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220706.tgz#11d5307c38e3b541a591d2d055689f8738d2c2da" - integrity sha1-EdUwfDjjtUGlkdLQVWifhzjSwto= - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220706" - "@abp/bootstrap" "~6.0.0-preview20220706" - "@abp/bootstrap-datepicker" "~6.0.0-preview20220706" - "@abp/datatables.net-bs5" "~6.0.0-preview20220706" - "@abp/font-awesome" "~6.0.0-preview20220706" - "@abp/jquery-form" "~6.0.0-preview20220706" - "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220706" - "@abp/lodash" "~6.0.0-preview20220706" - "@abp/luxon" "~6.0.0-preview20220706" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220706" - "@abp/select2" "~6.0.0-preview20220706" - "@abp/sweetalert2" "~6.0.0-preview20220706" - "@abp/timeago" "~6.0.0-preview20220706" - "@abp/toastr" "~6.0.0-preview20220706" - -"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220706.tgz#98c9070508f2eab900ef3ec3f07fa9fbe7abc1cf" - integrity sha1-mMkHBQjy6rkA7z7D8H+p++erwc8= +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-rc.1": + version "1.0.0-rc.1" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-rc.1.tgz#a10e11bd3516748d54999a7a9f0f5260920cf92f" + integrity sha1-oQ4RvTUWdI1UmZp6nw9SYJIM+S8= + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220719" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220719": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220720.tgz#8eadc3b3689ab81badf8bf4f69876dd21b4472c2" + integrity sha1-jq3Ds2iauBut+L9PaYdt0htEcsI= + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220720" + "@abp/bootstrap" "~6.0.0-preview20220720" + "@abp/bootstrap-datepicker" "~6.0.0-preview20220720" + "@abp/datatables.net-bs5" "~6.0.0-preview20220720" + "@abp/font-awesome" "~6.0.0-preview20220720" + "@abp/jquery-form" "~6.0.0-preview20220720" + "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220720" + "@abp/lodash" "~6.0.0-preview20220720" + "@abp/luxon" "~6.0.0-preview20220720" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220720" + "@abp/select2" "~6.0.0-preview20220720" + "@abp/sweetalert2" "~6.0.0-preview20220720" + "@abp/timeago" "~6.0.0-preview20220720" + "@abp/toastr" "~6.0.0-preview20220720" + +"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220720.tgz#86d45510348f194533c7bbcfe669256f60f0ec71" + integrity sha1-htRVEDSPGUUzx7vP5mklb2Dw7HE= dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220706.tgz#c0e067f669a5e9a793c064cd36bfc44ed6eca57b" - integrity sha1-wOBn9mml6aeTwGTNNr/ETtbspXs= +"@abp/bootstrap-datepicker@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220720.tgz#e0c305a1260555a5adcf2d8b50852339a96845fd" + integrity sha1-4MMFoSYFVaWtzy2LUIUjOaloRf0= dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220706.tgz#cac892165484c07248a384857eccacea69f301da" - integrity sha1-ysiSFlSEwHJIo4SFfsys6mnzAdo= +"@abp/bootstrap@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220720.tgz#0eab26a14dc434bc3f79da32f8c68b98b774c142" + integrity sha1-DqsmoU3ENLw/edoy+MaLmLd0wUI= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" bootstrap "^5.1.3" -"@abp/core@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220706.tgz#d53152cc92f4d969de21ea7bfa9e7a2fa7d5b8c3" - integrity sha1-1TFSzJL02WneIep7+p56L6fVuMM= +"@abp/core@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220720.tgz#a8197318482a74c847e4c359d77e106f625731fc" + integrity sha1-qBlzGEgqdMhH5MNZ134Qb2JXMfw= dependencies: - "@abp/utils" "~6.0.0-preview20220706" + "@abp/utils" "~6.0.0-preview20220720" -"@abp/datatables.net-bs5@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220706.tgz#73000a07a63c54910750c41f101d667c3d694407" - integrity sha1-cwAKB6Y8VJEHUMQfEB1mfD1pRAc= +"@abp/datatables.net-bs5@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220720.tgz#940315f5409721dc5c09d08d291bdd5c81b9777d" + integrity sha1-lAMV9UCXIdxcCdCNKRvdXIG5d30= dependencies: - "@abp/datatables.net" "~6.0.0-preview20220706" + "@abp/datatables.net" "~6.0.0-preview20220720" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220706.tgz#803785b6c56c03f50d99e102f3afab8b105ec1ef" - integrity sha1-gDeFtsVsA/UNmeEC86+rixBewe8= +"@abp/datatables.net@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220720.tgz#34aa416ac0fdd97961be8f946ba6536bd264f6bd" + integrity sha1-NKpBasD92Xlhvo+Ua6ZTa9Jk9r0= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220706.tgz#df58f0167513aba5b71c467ba14d1601400da6c2" - integrity sha1-31jwFnUTq6W3HEZ7oU0WAUANpsI= +"@abp/font-awesome@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220720.tgz#cbba37b3b3a0c659bada8133f6911c90b86fa6e7" + integrity sha1-y7o3s7Ogxlm62oEz9pEckLhvpuc= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220706.tgz#bc47253029b5120bd35a0e885acdc7ac2a64ef37" - integrity sha1-vEclMCm1EgvTWg6IWs3HrCpk7zc= +"@abp/jquery-form@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220720.tgz#f6dd53204faa99225ea92f1996431bb90cfeb17e" + integrity sha1-9t1TIE+qmSJeqS8ZlkMbuQz+sX4= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220706.tgz#089ac5c4614268cd67c1f3e97702dfed3de2d99d" - integrity sha1-CJrFxGFCaM1nwfPpdwLf7T3i2Z0= +"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220720.tgz#aa7f16ea28aa8c7445d71856a51f592541744982" + integrity sha1-qn8W6iiqjHRF1xhWpR9ZJUF0SYI= dependencies: - "@abp/jquery-validation" "~6.0.0-preview20220706" + "@abp/jquery-validation" "~6.0.0-preview20220720" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220706.tgz#f9ca93f8c3c05f429b5cba17f373ccefbe742685" - integrity sha1-+cqT+MPAX0KbXLoX83PM7750JoU= +"@abp/jquery-validation@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220720.tgz#4af78971bbe6ef17e110916656c64cf438a8ec3f" + integrity sha1-SveJcbvm7xfhEJFmVsZM9Dio7D8= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220706.tgz#ca0b243122ea73e52302e554fba738e7f4e6478b" - integrity sha1-ygskMSLqc+UjAuVU+6c45/TmR4s= +"@abp/jquery@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220720.tgz#b24a4dd4cd167c82d694e9849beb72afcd1ffb79" + integrity sha1-skpN1M0WfILWlOmEm+tyr80f+3k= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" jquery "~3.6.0" -"@abp/lodash@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220706.tgz#9fda3d6b0a3cb7af9704e9a2c4b73ca87b04f9e8" - integrity sha1-n9o9awo8t6+XBOmixLc8qHsE+eg= +"@abp/lodash@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220720.tgz#c67ebe78dcb862f84e4202baa4203245acf75791" + integrity sha1-xn6+eNy4YvhOQgK6pCAyRaz3V5E= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" lodash "^4.17.21" -"@abp/luxon@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220706.tgz#298edf10a7cc9c7753f0b2d84e077262b4fc1367" - integrity sha1-KY7fEKfMnHdT8LLYTgdyYrT8E2c= +"@abp/luxon@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220720.tgz#99eb8fc9e7c9e1c71850b562b6ec131b89e14dfb" + integrity sha1-meuPyefJ4ccYULVituwTG4nhTfs= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220706.tgz#d9cd9488f563a9118819cab997d0a31601c28578" - integrity sha1-2c2UiPVjqRGIGcq5l9CjFgHChXg= +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220720.tgz#9a9dc785a4c2ff6962c326f9aaa86d6621a3f66d" + integrity sha1-mp3HhaTC/2liwyb5qqhtZiGj9m0= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220706.tgz#283d7b82f7871d80120ddf7f152e7846fe239846" - integrity sha1-KD17gveHHYASDd9/FS54Rv4jmEY= +"@abp/select2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220720.tgz#32fed6ccedc18a98ba3d0d8f155bcd604d37864a" + integrity sha1-Mv7WzO3Bipi6PQ2PFVvNYE03hko= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220706.tgz#cc617eb7cdb2c1127155ff79ab80e7213d069bb0" - integrity sha1-zGF+t82ywRJxVf95q4DnIT0Gm7A= +"@abp/sweetalert2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220720.tgz#cdfe984653ed008173c669f3448a4a4b4e32a0e3" + integrity sha1-zf6YRlPtAIFzxmnzRIpKS04yoOM= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220706.tgz#2b676e41341b34f14fa8854f539c1a77b5427ce0" - integrity sha1-K2duQTQbNPFPqIVPU5wad7VCfOA= +"@abp/timeago@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220720.tgz#eff687139b888423b866fe6cefd8e305352be818" + integrity sha1-7/aHE5uIhCO4Zv5s79jjBTUr6Bg= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" timeago "^1.6.7" -"@abp/toastr@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220706.tgz#33708e757b8c258dce9eae2dbbbfa59f3ca557eb" - integrity sha1-M3COdXuMJY3Onq4tu7+lnzylV+s= +"@abp/toastr@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220720.tgz#bcaad9d365a46b44a290b61f921530f1c6327a93" + integrity sha1-vKrZ02Wka0SikLYfkhUw8cYyepM= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" toastr "^2.1.4" -"@abp/utils@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220706.tgz#35bfe9533ff0cb45ed64bbc99f52d50183a59173" - integrity sha1-Nb/pUz/wy0XtZLvJn1LVAYOlkXM= +"@abp/utils@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220720.tgz#82172d690ddbfb3bafa86fbf719cd9b4cc76ba2d" + integrity sha1-ghctaQ3b+zuvqG+/cZzZtMx2ui0= dependencies: just-compare "^1.3.0" diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/package.json new file mode 100644 index 0000000000..e69de29bb2 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 84847e1fd9..c4d92656ad 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 @@ -26,7 +26,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 0de071371b..b0b2ecbefe 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": "^1.0.0-beta.4" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-rc.1" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/yarn.lock index 2a82e25892..2b23fd7903 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/yarn.lock +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-beta.4": - version "1.0.0-beta.4" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-beta.4.tgz#dfd12fcd93a4443407990e0106c9112a059af216" - integrity sha1-39EvzZOkRDQHmQ4BBskRKgWa8hY= - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220630" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220630": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220706.tgz#11d5307c38e3b541a591d2d055689f8738d2c2da" - integrity sha1-EdUwfDjjtUGlkdLQVWifhzjSwto= - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220706" - "@abp/bootstrap" "~6.0.0-preview20220706" - "@abp/bootstrap-datepicker" "~6.0.0-preview20220706" - "@abp/datatables.net-bs5" "~6.0.0-preview20220706" - "@abp/font-awesome" "~6.0.0-preview20220706" - "@abp/jquery-form" "~6.0.0-preview20220706" - "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220706" - "@abp/lodash" "~6.0.0-preview20220706" - "@abp/luxon" "~6.0.0-preview20220706" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220706" - "@abp/select2" "~6.0.0-preview20220706" - "@abp/sweetalert2" "~6.0.0-preview20220706" - "@abp/timeago" "~6.0.0-preview20220706" - "@abp/toastr" "~6.0.0-preview20220706" - -"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220706.tgz#98c9070508f2eab900ef3ec3f07fa9fbe7abc1cf" - integrity sha1-mMkHBQjy6rkA7z7D8H+p++erwc8= +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-rc.1": + version "1.0.0-rc.1" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-rc.1.tgz#a10e11bd3516748d54999a7a9f0f5260920cf92f" + integrity sha1-oQ4RvTUWdI1UmZp6nw9SYJIM+S8= + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220719" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220719": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220720.tgz#8eadc3b3689ab81badf8bf4f69876dd21b4472c2" + integrity sha1-jq3Ds2iauBut+L9PaYdt0htEcsI= + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220720" + "@abp/bootstrap" "~6.0.0-preview20220720" + "@abp/bootstrap-datepicker" "~6.0.0-preview20220720" + "@abp/datatables.net-bs5" "~6.0.0-preview20220720" + "@abp/font-awesome" "~6.0.0-preview20220720" + "@abp/jquery-form" "~6.0.0-preview20220720" + "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220720" + "@abp/lodash" "~6.0.0-preview20220720" + "@abp/luxon" "~6.0.0-preview20220720" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220720" + "@abp/select2" "~6.0.0-preview20220720" + "@abp/sweetalert2" "~6.0.0-preview20220720" + "@abp/timeago" "~6.0.0-preview20220720" + "@abp/toastr" "~6.0.0-preview20220720" + +"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220720.tgz#86d45510348f194533c7bbcfe669256f60f0ec71" + integrity sha1-htRVEDSPGUUzx7vP5mklb2Dw7HE= dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220706.tgz#c0e067f669a5e9a793c064cd36bfc44ed6eca57b" - integrity sha1-wOBn9mml6aeTwGTNNr/ETtbspXs= +"@abp/bootstrap-datepicker@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220720.tgz#e0c305a1260555a5adcf2d8b50852339a96845fd" + integrity sha1-4MMFoSYFVaWtzy2LUIUjOaloRf0= dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220706.tgz#cac892165484c07248a384857eccacea69f301da" - integrity sha1-ysiSFlSEwHJIo4SFfsys6mnzAdo= +"@abp/bootstrap@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220720.tgz#0eab26a14dc434bc3f79da32f8c68b98b774c142" + integrity sha1-DqsmoU3ENLw/edoy+MaLmLd0wUI= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" bootstrap "^5.1.3" -"@abp/core@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220706.tgz#d53152cc92f4d969de21ea7bfa9e7a2fa7d5b8c3" - integrity sha1-1TFSzJL02WneIep7+p56L6fVuMM= +"@abp/core@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220720.tgz#a8197318482a74c847e4c359d77e106f625731fc" + integrity sha1-qBlzGEgqdMhH5MNZ134Qb2JXMfw= dependencies: - "@abp/utils" "~6.0.0-preview20220706" + "@abp/utils" "~6.0.0-preview20220720" -"@abp/datatables.net-bs5@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220706.tgz#73000a07a63c54910750c41f101d667c3d694407" - integrity sha1-cwAKB6Y8VJEHUMQfEB1mfD1pRAc= +"@abp/datatables.net-bs5@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220720.tgz#940315f5409721dc5c09d08d291bdd5c81b9777d" + integrity sha1-lAMV9UCXIdxcCdCNKRvdXIG5d30= dependencies: - "@abp/datatables.net" "~6.0.0-preview20220706" + "@abp/datatables.net" "~6.0.0-preview20220720" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220706.tgz#803785b6c56c03f50d99e102f3afab8b105ec1ef" - integrity sha1-gDeFtsVsA/UNmeEC86+rixBewe8= +"@abp/datatables.net@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220720.tgz#34aa416ac0fdd97961be8f946ba6536bd264f6bd" + integrity sha1-NKpBasD92Xlhvo+Ua6ZTa9Jk9r0= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220706.tgz#df58f0167513aba5b71c467ba14d1601400da6c2" - integrity sha1-31jwFnUTq6W3HEZ7oU0WAUANpsI= +"@abp/font-awesome@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220720.tgz#cbba37b3b3a0c659bada8133f6911c90b86fa6e7" + integrity sha1-y7o3s7Ogxlm62oEz9pEckLhvpuc= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220706.tgz#bc47253029b5120bd35a0e885acdc7ac2a64ef37" - integrity sha1-vEclMCm1EgvTWg6IWs3HrCpk7zc= +"@abp/jquery-form@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220720.tgz#f6dd53204faa99225ea92f1996431bb90cfeb17e" + integrity sha1-9t1TIE+qmSJeqS8ZlkMbuQz+sX4= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220706.tgz#089ac5c4614268cd67c1f3e97702dfed3de2d99d" - integrity sha1-CJrFxGFCaM1nwfPpdwLf7T3i2Z0= +"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220720.tgz#aa7f16ea28aa8c7445d71856a51f592541744982" + integrity sha1-qn8W6iiqjHRF1xhWpR9ZJUF0SYI= dependencies: - "@abp/jquery-validation" "~6.0.0-preview20220706" + "@abp/jquery-validation" "~6.0.0-preview20220720" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220706.tgz#f9ca93f8c3c05f429b5cba17f373ccefbe742685" - integrity sha1-+cqT+MPAX0KbXLoX83PM7750JoU= +"@abp/jquery-validation@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220720.tgz#4af78971bbe6ef17e110916656c64cf438a8ec3f" + integrity sha1-SveJcbvm7xfhEJFmVsZM9Dio7D8= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220706.tgz#ca0b243122ea73e52302e554fba738e7f4e6478b" - integrity sha1-ygskMSLqc+UjAuVU+6c45/TmR4s= +"@abp/jquery@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220720.tgz#b24a4dd4cd167c82d694e9849beb72afcd1ffb79" + integrity sha1-skpN1M0WfILWlOmEm+tyr80f+3k= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" jquery "~3.6.0" -"@abp/lodash@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220706.tgz#9fda3d6b0a3cb7af9704e9a2c4b73ca87b04f9e8" - integrity sha1-n9o9awo8t6+XBOmixLc8qHsE+eg= +"@abp/lodash@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220720.tgz#c67ebe78dcb862f84e4202baa4203245acf75791" + integrity sha1-xn6+eNy4YvhOQgK6pCAyRaz3V5E= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" lodash "^4.17.21" -"@abp/luxon@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220706.tgz#298edf10a7cc9c7753f0b2d84e077262b4fc1367" - integrity sha1-KY7fEKfMnHdT8LLYTgdyYrT8E2c= +"@abp/luxon@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220720.tgz#99eb8fc9e7c9e1c71850b562b6ec131b89e14dfb" + integrity sha1-meuPyefJ4ccYULVituwTG4nhTfs= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220706.tgz#d9cd9488f563a9118819cab997d0a31601c28578" - integrity sha1-2c2UiPVjqRGIGcq5l9CjFgHChXg= +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220720.tgz#9a9dc785a4c2ff6962c326f9aaa86d6621a3f66d" + integrity sha1-mp3HhaTC/2liwyb5qqhtZiGj9m0= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220706.tgz#283d7b82f7871d80120ddf7f152e7846fe239846" - integrity sha1-KD17gveHHYASDd9/FS54Rv4jmEY= +"@abp/select2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220720.tgz#32fed6ccedc18a98ba3d0d8f155bcd604d37864a" + integrity sha1-Mv7WzO3Bipi6PQ2PFVvNYE03hko= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220706.tgz#cc617eb7cdb2c1127155ff79ab80e7213d069bb0" - integrity sha1-zGF+t82ywRJxVf95q4DnIT0Gm7A= +"@abp/sweetalert2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220720.tgz#cdfe984653ed008173c669f3448a4a4b4e32a0e3" + integrity sha1-zf6YRlPtAIFzxmnzRIpKS04yoOM= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220706.tgz#2b676e41341b34f14fa8854f539c1a77b5427ce0" - integrity sha1-K2duQTQbNPFPqIVPU5wad7VCfOA= +"@abp/timeago@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220720.tgz#eff687139b888423b866fe6cefd8e305352be818" + integrity sha1-7/aHE5uIhCO4Zv5s79jjBTUr6Bg= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" timeago "^1.6.7" -"@abp/toastr@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220706.tgz#33708e757b8c258dce9eae2dbbbfa59f3ca557eb" - integrity sha1-M3COdXuMJY3Onq4tu7+lnzylV+s= +"@abp/toastr@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220720.tgz#bcaad9d365a46b44a290b61f921530f1c6327a93" + integrity sha1-vKrZ02Wka0SikLYfkhUw8cYyepM= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" toastr "^2.1.4" -"@abp/utils@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220706.tgz#35bfe9533ff0cb45ed64bbc99f52d50183a59173" - integrity sha1-Nb/pUz/wy0XtZLvJn1LVAYOlkXM= +"@abp/utils@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220720.tgz#82172d690ddbfb3bafa86fbf719cd9b4cc76ba2d" + integrity sha1-ghctaQ3b+zuvqG+/cZzZtMx2ui0= dependencies: just-compare "^1.3.0" 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 742ae480f1..c456030c2a 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 @@ -41,7 +41,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 0de071371b..b0b2ecbefe 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": "^1.0.0-beta.4" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-rc.1" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/yarn.lock index 75aa74bee6..78a3147810 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/yarn.lock +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-beta.4": - version "1.0.0-beta.4" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-beta.4.tgz#dfd12fcd93a4443407990e0106c9112a059af216" - integrity sha1-39EvzZOkRDQHmQ4BBskRKgWa8hY= - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220630" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220630": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220706.tgz#11d5307c38e3b541a591d2d055689f8738d2c2da" - integrity sha1-EdUwfDjjtUGlkdLQVWifhzjSwto= - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220706" - "@abp/bootstrap" "~6.0.0-preview20220706" - "@abp/bootstrap-datepicker" "~6.0.0-preview20220706" - "@abp/datatables.net-bs5" "~6.0.0-preview20220706" - "@abp/font-awesome" "~6.0.0-preview20220706" - "@abp/jquery-form" "~6.0.0-preview20220706" - "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220706" - "@abp/lodash" "~6.0.0-preview20220706" - "@abp/luxon" "~6.0.0-preview20220706" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220706" - "@abp/select2" "~6.0.0-preview20220706" - "@abp/sweetalert2" "~6.0.0-preview20220706" - "@abp/timeago" "~6.0.0-preview20220706" - "@abp/toastr" "~6.0.0-preview20220706" - -"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220706.tgz#98c9070508f2eab900ef3ec3f07fa9fbe7abc1cf" - integrity sha1-mMkHBQjy6rkA7z7D8H+p++erwc8= +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-rc.1": + version "1.0.0-rc.1" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-rc.1.tgz#a10e11bd3516748d54999a7a9f0f5260920cf92f" + integrity sha1-oQ4RvTUWdI1UmZp6nw9SYJIM+S8= + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220719" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220719": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220720.tgz#8eadc3b3689ab81badf8bf4f69876dd21b4472c2" + integrity sha1-jq3Ds2iauBut+L9PaYdt0htEcsI= + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220720" + "@abp/bootstrap" "~6.0.0-preview20220720" + "@abp/bootstrap-datepicker" "~6.0.0-preview20220720" + "@abp/datatables.net-bs5" "~6.0.0-preview20220720" + "@abp/font-awesome" "~6.0.0-preview20220720" + "@abp/jquery-form" "~6.0.0-preview20220720" + "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220720" + "@abp/lodash" "~6.0.0-preview20220720" + "@abp/luxon" "~6.0.0-preview20220720" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220720" + "@abp/select2" "~6.0.0-preview20220720" + "@abp/sweetalert2" "~6.0.0-preview20220720" + "@abp/timeago" "~6.0.0-preview20220720" + "@abp/toastr" "~6.0.0-preview20220720" + +"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220720.tgz#86d45510348f194533c7bbcfe669256f60f0ec71" + integrity sha1-htRVEDSPGUUzx7vP5mklb2Dw7HE= dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220706.tgz#c0e067f669a5e9a793c064cd36bfc44ed6eca57b" - integrity sha1-wOBn9mml6aeTwGTNNr/ETtbspXs= +"@abp/bootstrap-datepicker@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220720.tgz#e0c305a1260555a5adcf2d8b50852339a96845fd" + integrity sha1-4MMFoSYFVaWtzy2LUIUjOaloRf0= dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220706.tgz#cac892165484c07248a384857eccacea69f301da" - integrity sha1-ysiSFlSEwHJIo4SFfsys6mnzAdo= +"@abp/bootstrap@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220720.tgz#0eab26a14dc434bc3f79da32f8c68b98b774c142" + integrity sha1-DqsmoU3ENLw/edoy+MaLmLd0wUI= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" bootstrap "^5.1.3" -"@abp/core@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220706.tgz#d53152cc92f4d969de21ea7bfa9e7a2fa7d5b8c3" - integrity sha1-1TFSzJL02WneIep7+p56L6fVuMM= +"@abp/core@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220720.tgz#a8197318482a74c847e4c359d77e106f625731fc" + integrity sha1-qBlzGEgqdMhH5MNZ134Qb2JXMfw= dependencies: - "@abp/utils" "~6.0.0-preview20220706" + "@abp/utils" "~6.0.0-preview20220720" -"@abp/datatables.net-bs5@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220706.tgz#73000a07a63c54910750c41f101d667c3d694407" - integrity sha1-cwAKB6Y8VJEHUMQfEB1mfD1pRAc= +"@abp/datatables.net-bs5@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220720.tgz#940315f5409721dc5c09d08d291bdd5c81b9777d" + integrity sha1-lAMV9UCXIdxcCdCNKRvdXIG5d30= dependencies: - "@abp/datatables.net" "~6.0.0-preview20220706" + "@abp/datatables.net" "~6.0.0-preview20220720" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220706.tgz#803785b6c56c03f50d99e102f3afab8b105ec1ef" - integrity sha1-gDeFtsVsA/UNmeEC86+rixBewe8= +"@abp/datatables.net@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220720.tgz#34aa416ac0fdd97961be8f946ba6536bd264f6bd" + integrity sha1-NKpBasD92Xlhvo+Ua6ZTa9Jk9r0= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220706.tgz#df58f0167513aba5b71c467ba14d1601400da6c2" - integrity sha1-31jwFnUTq6W3HEZ7oU0WAUANpsI= +"@abp/font-awesome@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220720.tgz#cbba37b3b3a0c659bada8133f6911c90b86fa6e7" + integrity sha1-y7o3s7Ogxlm62oEz9pEckLhvpuc= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220706.tgz#bc47253029b5120bd35a0e885acdc7ac2a64ef37" - integrity sha1-vEclMCm1EgvTWg6IWs3HrCpk7zc= +"@abp/jquery-form@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220720.tgz#f6dd53204faa99225ea92f1996431bb90cfeb17e" + integrity sha1-9t1TIE+qmSJeqS8ZlkMbuQz+sX4= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220706.tgz#089ac5c4614268cd67c1f3e97702dfed3de2d99d" - integrity sha1-CJrFxGFCaM1nwfPpdwLf7T3i2Z0= +"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220720.tgz#aa7f16ea28aa8c7445d71856a51f592541744982" + integrity sha1-qn8W6iiqjHRF1xhWpR9ZJUF0SYI= dependencies: - "@abp/jquery-validation" "~6.0.0-preview20220706" + "@abp/jquery-validation" "~6.0.0-preview20220720" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220706.tgz#f9ca93f8c3c05f429b5cba17f373ccefbe742685" - integrity sha1-+cqT+MPAX0KbXLoX83PM7750JoU= +"@abp/jquery-validation@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220720.tgz#4af78971bbe6ef17e110916656c64cf438a8ec3f" + integrity sha1-SveJcbvm7xfhEJFmVsZM9Dio7D8= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220706.tgz#ca0b243122ea73e52302e554fba738e7f4e6478b" - integrity sha1-ygskMSLqc+UjAuVU+6c45/TmR4s= +"@abp/jquery@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220720.tgz#b24a4dd4cd167c82d694e9849beb72afcd1ffb79" + integrity sha1-skpN1M0WfILWlOmEm+tyr80f+3k= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" jquery "~3.6.0" -"@abp/lodash@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220706.tgz#9fda3d6b0a3cb7af9704e9a2c4b73ca87b04f9e8" - integrity sha1-n9o9awo8t6+XBOmixLc8qHsE+eg= +"@abp/lodash@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220720.tgz#c67ebe78dcb862f84e4202baa4203245acf75791" + integrity sha1-xn6+eNy4YvhOQgK6pCAyRaz3V5E= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" lodash "^4.17.21" -"@abp/luxon@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220706.tgz#298edf10a7cc9c7753f0b2d84e077262b4fc1367" - integrity sha1-KY7fEKfMnHdT8LLYTgdyYrT8E2c= +"@abp/luxon@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220720.tgz#99eb8fc9e7c9e1c71850b562b6ec131b89e14dfb" + integrity sha1-meuPyefJ4ccYULVituwTG4nhTfs= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220706.tgz#d9cd9488f563a9118819cab997d0a31601c28578" - integrity sha1-2c2UiPVjqRGIGcq5l9CjFgHChXg= +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220720.tgz#9a9dc785a4c2ff6962c326f9aaa86d6621a3f66d" + integrity sha1-mp3HhaTC/2liwyb5qqhtZiGj9m0= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220706.tgz#283d7b82f7871d80120ddf7f152e7846fe239846" - integrity sha1-KD17gveHHYASDd9/FS54Rv4jmEY= +"@abp/select2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220720.tgz#32fed6ccedc18a98ba3d0d8f155bcd604d37864a" + integrity sha1-Mv7WzO3Bipi6PQ2PFVvNYE03hko= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220706.tgz#cc617eb7cdb2c1127155ff79ab80e7213d069bb0" - integrity sha1-zGF+t82ywRJxVf95q4DnIT0Gm7A= +"@abp/sweetalert2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220720.tgz#cdfe984653ed008173c669f3448a4a4b4e32a0e3" + integrity sha1-zf6YRlPtAIFzxmnzRIpKS04yoOM= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220706.tgz#2b676e41341b34f14fa8854f539c1a77b5427ce0" - integrity sha1-K2duQTQbNPFPqIVPU5wad7VCfOA= +"@abp/timeago@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220720.tgz#eff687139b888423b866fe6cefd8e305352be818" + integrity sha1-7/aHE5uIhCO4Zv5s79jjBTUr6Bg= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" timeago "^1.6.7" -"@abp/toastr@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220706.tgz#33708e757b8c258dce9eae2dbbbfa59f3ca557eb" - integrity sha1-M3COdXuMJY3Onq4tu7+lnzylV+s= +"@abp/toastr@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220720.tgz#bcaad9d365a46b44a290b61f921530f1c6327a93" + integrity sha1-vKrZ02Wka0SikLYfkhUw8cYyepM= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" toastr "^2.1.4" -"@abp/utils@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220706.tgz#35bfe9533ff0cb45ed64bbc99f52d50183a59173" - integrity sha1-Nb/pUz/wy0XtZLvJn1LVAYOlkXM= +"@abp/utils@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220720.tgz#82172d690ddbfb3bafa86fbf719cd9b4cc76ba2d" + integrity sha1-ghctaQ3b+zuvqG+/cZzZtMx2ui0= dependencies: just-compare "^1.3.0" diff --git a/templates/console/src/MyCompanyName.MyProjectName/MyProjectNameHostedService.cs b/templates/console/src/MyCompanyName.MyProjectName/MyProjectNameHostedService.cs index 7bf0787299..c31bcc282f 100644 --- a/templates/console/src/MyCompanyName.MyProjectName/MyProjectNameHostedService.cs +++ b/templates/console/src/MyCompanyName.MyProjectName/MyProjectNameHostedService.cs @@ -1,42 +1,24 @@ using System.Threading; using System.Threading.Tasks; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using Serilog; using Volo.Abp; namespace MyCompanyName.MyProjectName; public class MyProjectNameHostedService : IHostedService { - private IAbpApplicationWithInternalServiceProvider _abpApplication; + private readonly IAbpApplicationWithExternalServiceProvider _abpApplication; + private readonly HelloWorldService _helloWorldService; - private readonly IConfiguration _configuration; - private readonly IHostEnvironment _hostEnvironment; - - public MyProjectNameHostedService(IConfiguration configuration, IHostEnvironment hostEnvironment) + public MyProjectNameHostedService(HelloWorldService helloWorldService, IAbpApplicationWithExternalServiceProvider abpApplication) { - _configuration = configuration; - _hostEnvironment = hostEnvironment; + _helloWorldService = helloWorldService; + _abpApplication = abpApplication; } public async Task StartAsync(CancellationToken cancellationToken) { - _abpApplication = await AbpApplicationFactory.CreateAsync(options => - { - options.Services.ReplaceConfiguration(_configuration); - options.Services.AddSingleton(_hostEnvironment); - - options.UseAutofac(); - options.Services.AddLogging(loggingBuilder => loggingBuilder.AddSerilog()); - }); - - await _abpApplication.InitializeAsync(); - - var helloWorldService = _abpApplication.ServiceProvider.GetRequiredService(); - - await helloWorldService.SayHelloAsync(); + await _helloWorldService.SayHelloAsync(); } public async Task StopAsync(CancellationToken cancellationToken) diff --git a/templates/console/src/MyCompanyName.MyProjectName/Program.cs b/templates/console/src/MyCompanyName.MyProjectName/Program.cs index 83a61ceead..73c824a82e 100644 --- a/templates/console/src/MyCompanyName.MyProjectName/Program.cs +++ b/templates/console/src/MyCompanyName.MyProjectName/Program.cs @@ -4,6 +4,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; +using Volo.Abp; namespace MyCompanyName.MyProjectName; @@ -27,13 +28,23 @@ public class Program { Log.Information("Starting console host."); - await Host.CreateDefaultBuilder(args) - .ConfigureServices(services => + var builder = Host.CreateDefaultBuilder(args); + + builder.ConfigureServices(services => + { + services.AddHostedService(); + services.AddApplicationAsync(options => { - services.AddHostedService(); - }) - .UseSerilog() - .RunConsoleAsync(); + options.Services.ReplaceConfiguration(services.GetConfiguration()); + options.UseAutofac(); + options.Services.AddLogging(loggingBuilder => loggingBuilder.AddSerilog()); + }); + }).UseConsoleLifetime(); + + var host = builder.Build(); + await host.Services.GetRequiredService().InitializeAsync(host.Services); + + await host.RunAsync(); return 0; } @@ -47,4 +58,4 @@ public class Program Log.CloseAndFlush(); } } -} +} \ No newline at end of file diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index f41af0d268..1018f2f24c 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -15,14 +15,14 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~5.3.2", - "@abp/ng.components": "~5.3.2", - "@abp/ng.core": "~5.3.2", - "@abp/ng.identity": "~5.3.2", - "@abp/ng.setting-management": "~5.3.2", - "@abp/ng.tenant-management": "~5.3.2", - "@abp/ng.theme.basic": "~5.3.2", - "@abp/ng.theme.shared": "~5.3.2", + "@abp/ng.account": "~5.3.3", + "@abp/ng.components": "~5.3.3", + "@abp/ng.core": "~5.3.3", + "@abp/ng.identity": "~5.3.3", + "@abp/ng.setting-management": "~5.3.3", + "@abp/ng.tenant-management": "~5.3.3", + "@abp/ng.theme.basic": "~5.3.3", + "@abp/ng.theme.shared": "~5.3.3", "@angular/animations": "~13.3.3", "@angular/common": "~13.3.3", "@angular/compiler": "~13.3.3", @@ -37,7 +37,7 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@abp/ng.schematics": "~5.3.2", + "@abp/ng.schematics": "~5.3.3", "@angular-devkit/build-angular": "~13.3.3", "@angular-eslint/builder": "~13.2.1", "@angular-eslint/eslint-plugin": "~13.2.1", diff --git a/templates/module/angular/projects/my-project-name/package.json b/templates/module/angular/projects/my-project-name/package.json index dfe37d2f92..945dcec55b 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": ">=9", "@angular/core": ">=9", - "@abp/ng.core": ">=5.3.2", - "@abp/ng.theme.shared": ">=5.3.2" + "@abp/ng.core": ">=5.3.3", + "@abp/ng.theme.shared": ">=5.3.3" }, "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 2703bfccc5..cddb128fd5 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": "^5.3.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.3" } } 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 d9a5ecfc6e..25b2156f2f 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": "^5.3.2", - "@abp/aspnetcore.components.server.basictheme": "^5.3.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.3", + "@abp/aspnetcore.components.server.basictheme": "^5.3.3" } } 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 2e9daa28f6..534c364bfe 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": "^5.3.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.3" } } 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 2e9daa28f6..534c364bfe 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": "^5.3.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.3" } }