diff --git a/docs/cs/Getting-Started-Angular-Template.md b/docs/cs/Getting-Started-Angular-Template.md index 6accc637e8..5dfc65c7ec 100644 --- a/docs/cs/Getting-Started-Angular-Template.md +++ b/docs/cs/Getting-Started-Angular-Template.md @@ -26,10 +26,10 @@ abp new Acme.BookStore -u angular Vytvořené řešení vyžaduje; -* [Visual Studio 2017 (v15.9.0+)](https://visualstudio.microsoft.com/tr/downloads/) -* [.NET Core 2.2+](https://www.microsoft.com/net/download/dotnet-core/) -* [Node v10.16+](https://nodejs.org) -* [Yarn v1.17+](https://yarnpkg.com/) +* [Visual Studio 2019 (v16.3+)](https://visualstudio.microsoft.com/vs/) +* [.NET Core 3.0+](https://www.microsoft.com/net/download/dotnet-core/) +* [Node v12+](https://nodejs.org) +* [Yarn v1.19+](https://yarnpkg.com/) ### Struktura řešení diff --git a/docs/cs/Getting-Started-AspNetCore-MVC-Template.md b/docs/cs/Getting-Started-AspNetCore-MVC-Template.md index b1cb3bb57e..32edd59931 100644 --- a/docs/cs/Getting-Started-AspNetCore-MVC-Template.md +++ b/docs/cs/Getting-Started-AspNetCore-MVC-Template.md @@ -26,8 +26,10 @@ Příkaz `new` vytvoří **vrstvenou MVC aplikaci** s **Entity Framework Core** Vytvořené řešení vyžaduje; -* [Visual Studio 2017 (v15.9.0+)](https://visualstudio.microsoft.com/tr/downloads/) -* [.NET Core 2.2+](https://www.microsoft.com/net/download/dotnet-core/) +* [Visual Studio 2019 (v16.3+)](https://visualstudio.microsoft.com/vs/) +* [.NET Core 3.0+](https://www.microsoft.com/net/download/dotnet-core/) +* [Node v12+](https://nodejs.org) +* [Yarn v1.19+](https://yarnpkg.com/) ### Struktura řešení diff --git a/docs/en/Entities.md b/docs/en/Entities.md index 3a946461e7..8ae7cdf235 100644 --- a/docs/en/Entities.md +++ b/docs/en/Entities.md @@ -59,7 +59,8 @@ Entities with composite keys should implement the `GetKeys()` method as shown ab Notice that you also need to define keys of the entity in your **object-relational mapping** (ORM) configuration. -> Composite primary keys has a restriction with repositories. Since it has not known Id property, you can not use `IRepository` for these entities. However, you can always use `IRepository`. See [repositories documentation](Repositories.md) for more. +> Also note that Entities with Composite Primary Keys cannot utilize the `IRepository` interface since it requires a single unique Id property. However, you can always use `IRepository`. See [repositories documentation](Repositories.md) for more. + ### AggregateRoot Class diff --git a/docs/en/Getting-Started-Angular-Template.md b/docs/en/Getting-Started-Angular-Template.md index 5ae006d82e..d6d3b84be8 100644 --- a/docs/en/Getting-Started-Angular-Template.md +++ b/docs/en/Getting-Started-Angular-Template.md @@ -26,10 +26,10 @@ abp new Acme.BookStore -u angular The created solution requires; -* [Visual Studio 2017 (v15.9.0+)](https://visualstudio.microsoft.com/tr/downloads/) -* [.NET Core 2.2+](https://www.microsoft.com/net/download/dotnet-core/) -* [Node v10.16+](https://nodejs.org) -* [Yarn v1.17+](https://yarnpkg.com/) +* [Visual Studio 2019 (v16.3+)](https://visualstudio.microsoft.com/vs/) +* [.NET Core 3.0+](https://www.microsoft.com/net/download/dotnet-core/) +* [Node v12+](https://nodejs.org) +* [Yarn v1.19+](https://yarnpkg.com/) ### The Solution Structure diff --git a/docs/en/Getting-Started-AspNetCore-MVC-Template.md b/docs/en/Getting-Started-AspNetCore-MVC-Template.md index e3aeaa89a7..563ce0182d 100644 --- a/docs/en/Getting-Started-AspNetCore-MVC-Template.md +++ b/docs/en/Getting-Started-AspNetCore-MVC-Template.md @@ -26,8 +26,10 @@ abp new Acme.BookStore The created solution requires; -* [Visual Studio 2017 (v15.9.0+)](https://visualstudio.microsoft.com/tr/downloads/) -* [.NET Core 2.2+](https://www.microsoft.com/net/download/dotnet-core/) +* [Visual Studio 2019 (v16.3+)](https://visualstudio.microsoft.com/vs/) +* [.NET Core 3.0+](https://www.microsoft.com/net/download/dotnet-core/) +* [Node v12+](https://nodejs.org) +* [Yarn v1.19+](https://yarnpkg.com/) ### The Solution Structure diff --git a/docs/pt-BR/Getting-Started-Angular-Template.md b/docs/pt-BR/Getting-Started-Angular-Template.md index f8f1eac944..707e06cef3 100644 --- a/docs/pt-BR/Getting-Started-Angular-Template.md +++ b/docs/pt-BR/Getting-Started-Angular-Template.md @@ -26,10 +26,10 @@ abp new Acme.BookStore -u angular A solução criada requer; -- [Visual Studio 2017 (v15.9.0 +)](https://visualstudio.microsoft.com/tr/downloads/) -- [.NET Core 2.2 ou superior](https://www.microsoft.com/net/download/dotnet-core/) -- [Node v10.16 +](https://nodejs.org/) -- [Yarn v1.17 +](https://yarnpkg.com/) +* [Visual Studio 2019 (v16.3+)](https://visualstudio.microsoft.com/vs/) +* [.NET Core 3.0+](https://www.microsoft.com/net/download/dotnet-core/) +* [Node v12+](https://nodejs.org) +* [Yarn v1.19+](https://yarnpkg.com/) ### A Estrutura da Solução diff --git a/docs/pt-BR/Getting-Started-AspNetCore-MVC-Template.md b/docs/pt-BR/Getting-Started-AspNetCore-MVC-Template.md index 029b898b8d..ac82ff0279 100644 --- a/docs/pt-BR/Getting-Started-AspNetCore-MVC-Template.md +++ b/docs/pt-BR/Getting-Started-AspNetCore-MVC-Template.md @@ -26,8 +26,10 @@ abp new Acme.BookStore A solução criada requer; -- [Visual Studio 2017 (v15.9.0 +)](https://visualstudio.microsoft.com/tr/downloads/) -- [.NET Core 2.2 ou superior](https://www.microsoft.com/net/download/dotnet-core/) +* [Visual Studio 2019 (v16.3+)](https://visualstudio.microsoft.com/vs/) +* [.NET Core 3.0+](https://www.microsoft.com/net/download/dotnet-core/) +* [Node v12+](https://nodejs.org) +* [Yarn v1.19+](https://yarnpkg.com/) ### A Estrutura da Solução diff --git a/docs/zh-Hans/Getting-Started-AspNetCore-MVC-Template.md b/docs/zh-Hans/Getting-Started-AspNetCore-MVC-Template.md index 3d74fc6354..4d6695c79b 100644 --- a/docs/zh-Hans/Getting-Started-AspNetCore-MVC-Template.md +++ b/docs/zh-Hans/Getting-Started-AspNetCore-MVC-Template.md @@ -24,8 +24,10 @@ abp new Acme.BookStore 创建项目的要求: -* [Visual Studio 2017 (v15.9.0+)](https://visualstudio.microsoft.com/tr/downloads/) -* [.NET Core 2.2+](https://www.microsoft.com/net/download/dotnet-core/) +* [Visual Studio 2019 (v16.3+)](https://visualstudio.microsoft.com/vs/) +* [.NET Core 3.0+](https://www.microsoft.com/net/download/dotnet-core/) +* [Node v12+](https://nodejs.org) +* [Yarn v1.19+](https://yarnpkg.com/) ### 解决方案结构 diff --git a/framework/Volo.Abp.sln b/framework/Volo.Abp.sln index e71b58eba0..088a9437a8 100644 --- a/framework/Volo.Abp.sln +++ b/framework/Volo.Abp.sln @@ -250,7 +250,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.MailKit.Tests", "t EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.ObjectMapping.Tests", "test\Volo.Abp.ObjectMapping.Tests\Volo.Abp.ObjectMapping.Tests.csproj", "{667F5544-C1EB-447C-96FD-9B757F04DE2B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Ddd.Application.Contracts", "src\Volo.Abp.Ddd.Application.Contracts\Volo.Abp.Ddd.Application.Contracts.csproj", "{73559227-EBF0-475F-835B-1FF0CD9132AA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Ddd.Application.Contracts", "src\Volo.Abp.Ddd.Application.Contracts\Volo.Abp.Ddd.Application.Contracts.csproj", "{73559227-EBF0-475F-835B-1FF0CD9132AA}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Minify", "src\Volo.Abp.Minify\Volo.Abp.Minify.csproj", "{928DC30D-C078-4BB4-A9F8-FE7252C67DC6}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Minify.Tests", "test\Volo.Abp.Minify.Tests\Volo.Abp.Minify.Tests.csproj", "{E69182B3-350A-43F5-A935-5EBBEBECEF97}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -750,6 +754,14 @@ Global {73559227-EBF0-475F-835B-1FF0CD9132AA}.Debug|Any CPU.Build.0 = Debug|Any CPU {73559227-EBF0-475F-835B-1FF0CD9132AA}.Release|Any CPU.ActiveCfg = Release|Any CPU {73559227-EBF0-475F-835B-1FF0CD9132AA}.Release|Any CPU.Build.0 = Release|Any CPU + {928DC30D-C078-4BB4-A9F8-FE7252C67DC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {928DC30D-C078-4BB4-A9F8-FE7252C67DC6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {928DC30D-C078-4BB4-A9F8-FE7252C67DC6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {928DC30D-C078-4BB4-A9F8-FE7252C67DC6}.Release|Any CPU.Build.0 = Release|Any CPU + {E69182B3-350A-43F5-A935-5EBBEBECEF97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E69182B3-350A-43F5-A935-5EBBEBECEF97}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E69182B3-350A-43F5-A935-5EBBEBECEF97}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E69182B3-350A-43F5-A935-5EBBEBECEF97}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -878,6 +890,8 @@ Global {70DD6E17-B98B-4B00-8F38-C489E291BB53} = {447C8A77-E5F0-4538-8687-7383196D04EA} {667F5544-C1EB-447C-96FD-9B757F04DE2B} = {447C8A77-E5F0-4538-8687-7383196D04EA} {73559227-EBF0-475F-835B-1FF0CD9132AA} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} + {928DC30D-C078-4BB4-A9F8-FE7252C67DC6} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} + {E69182B3-350A-43F5-A935-5EBBEBECEF97} = {447C8A77-E5F0-4538-8687-7383196D04EA} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5} diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj index 4427b40dd6..04158b461a 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj @@ -13,6 +13,7 @@ + diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/AbpAspNetCoreMvcUiBundlingModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/AbpAspNetCoreMvcUiBundlingModule.cs index a0f0e65f1e..3a99953f25 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/AbpAspNetCoreMvcUiBundlingModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/AbpAspNetCoreMvcUiBundlingModule.cs @@ -1,9 +1,10 @@ using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap; +using Volo.Abp.Minify; using Volo.Abp.Modularity; namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling { - [DependsOn(typeof(AbpAspNetCoreMvcUiBootstrapModule))] + [DependsOn(typeof(AbpAspNetCoreMvcUiBootstrapModule), typeof(AbpMinifyModule))] public class AbpAspNetCoreMvcUiBundlingModule : AbpModule { diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundlerBase.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundlerBase.cs index 8c2258e1eb..115029dbe5 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundlerBase.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundlerBase.cs @@ -3,9 +3,9 @@ using System.Text; using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; -using Volo.Abp.AspNetCore.Mvc.UI.Minification; using Volo.Abp.AspNetCore.VirtualFileSystem; using Volo.Abp.DependencyInjection; +using Volo.Abp.Minify; namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling { diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/Scripts/ScriptBundler.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/Scripts/ScriptBundler.cs index 7b2887eb90..ec997a5aac 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/Scripts/ScriptBundler.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/Scripts/ScriptBundler.cs @@ -1,6 +1,6 @@ using System; -using Volo.Abp.AspNetCore.Mvc.UI.Minification.Scripts; using Volo.Abp.AspNetCore.VirtualFileSystem; +using Volo.Abp.Minify.Scripts; namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Scripts { diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/Styles/StyleBundler.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/Styles/StyleBundler.cs index ac33211860..9651e7d5aa 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/Styles/StyleBundler.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/Styles/StyleBundler.cs @@ -1,8 +1,8 @@ using System; using System.IO; using Microsoft.AspNetCore.Hosting; -using Volo.Abp.AspNetCore.Mvc.UI.Minification.Styles; using Volo.Abp.AspNetCore.VirtualFileSystem; +using Volo.Abp.Minify.Styles; namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Styles { diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Application.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Application.cshtml index 5c4f5475a5..37f64fd7c8 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Application.cshtml +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Application.cshtml @@ -57,7 +57,9 @@
@(await Component.InvokeAsync())
- @RenderSection("content_toolbar", false) +
+ @RenderSection("content_toolbar", false) +
@RenderBody()
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ProxyScripting/ServiceProxyGenerationModel.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ProxyScripting/ServiceProxyGenerationModel.cs index 5cc9a0a3c5..20dae137e7 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ProxyScripting/ServiceProxyGenerationModel.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ProxyScripting/ServiceProxyGenerationModel.cs @@ -11,6 +11,8 @@ namespace Volo.Abp.AspNetCore.Mvc.ProxyScripting public bool UseCache { get; set; } + public bool Minify { get; set; } + public string Modules { get; set; } public string Controllers { get; set; } @@ -32,7 +34,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ProxyScripting public ProxyScriptingModel CreateOptions() { - var options = new ProxyScriptingModel(Type, UseCache); + var options = new ProxyScriptingModel(Type, UseCache, Minify); if (!Modules.IsNullOrEmpty()) { diff --git a/framework/src/Volo.Abp.Http.Client/Microsoft/Extensions/DependencyInjection/ServiceCollectionDynamicHttpClientProxyExtensions.cs b/framework/src/Volo.Abp.Http.Client/Microsoft/Extensions/DependencyInjection/ServiceCollectionDynamicHttpClientProxyExtensions.cs index 1ccf7a2af5..54387d2871 100644 --- a/framework/src/Volo.Abp.Http.Client/Microsoft/Extensions/DependencyInjection/ServiceCollectionDynamicHttpClientProxyExtensions.cs +++ b/framework/src/Volo.Abp.Http.Client/Microsoft/Extensions/DependencyInjection/ServiceCollectionDynamicHttpClientProxyExtensions.cs @@ -41,6 +41,8 @@ namespace Microsoft.Extensions.DependencyInjection { Check.NotNull(services, nameof(assembly)); + AddHttpClientFactoryAndPolicy(services, remoteServiceConfigurationName, configureHttpClientBuilder); + //TODO: Make a configuration option and add remoteServiceName inside it! //TODO: Add option to change type filter @@ -53,9 +55,8 @@ namespace Microsoft.Extensions.DependencyInjection services.AddHttpClientProxy( serviceType, remoteServiceConfigurationName, - asDefaultServices, - configureHttpClientBuilder - ); + asDefaultServices + ); } return services; @@ -82,14 +83,46 @@ namespace Microsoft.Extensions.DependencyInjection bool asDefaultService = true, Action configureHttpClientBuilder = null) { + AddHttpClientFactoryAndPolicy(services, remoteServiceConfigurationName, configureHttpClientBuilder); + return services.AddHttpClientProxy( typeof(T), remoteServiceConfigurationName, - asDefaultService, - configureHttpClientBuilder + asDefaultService ); } + /// + /// Use IHttpClientFactory and polly + /// + /// Service collection + /// + /// The name of the remote service configuration to be used by the HTTP Client proxies. + /// See . + /// + /// + /// A delegate that is used to configure an . + /// + public static IServiceCollection AddHttpClientFactoryAndPolicy( + [NotNull] this IServiceCollection services, + [NotNull] string remoteServiceConfigurationName = RemoteServiceConfigurationDictionary.DefaultName, + Action configureHttpClientBuilder = null) + { + var httpClientBuilder = services.AddHttpClient(remoteServiceConfigurationName); + if (configureHttpClientBuilder == null) + { + httpClientBuilder.AddTransientHttpErrorPolicy(builder => + // retry 3 times + builder.WaitAndRetryAsync(3, i => TimeSpan.FromSeconds(Math.Pow(2, i)))); + } + else + { + configureHttpClientBuilder.Invoke(httpClientBuilder); + } + + return services; + } + /// /// Registers HTTP Client Proxy for given service . /// @@ -102,15 +135,11 @@ namespace Microsoft.Extensions.DependencyInjection /// /// True, to register the HTTP client proxy as the default implementation for the service . /// - /// - /// A delegate that is used to configure an . - /// public static IServiceCollection AddHttpClientProxy( [NotNull] this IServiceCollection services, [NotNull] Type type, [NotNull] string remoteServiceConfigurationName = RemoteServiceConfigurationDictionary.DefaultName, - bool asDefaultService = true, - Action configureHttpClientBuilder = null) + bool asDefaultService = true) { Check.NotNull(services, nameof(services)); Check.NotNull(type, nameof(type)); @@ -120,19 +149,6 @@ namespace Microsoft.Extensions.DependencyInjection { options.HttpClientProxies[type] = new DynamicHttpClientProxyConfig(type, remoteServiceConfigurationName); }); - - //use IHttpClientFactory and polly - var httpClientBuilder = services.AddHttpClient(remoteServiceConfigurationName); - if (configureHttpClientBuilder == null) - { - httpClientBuilder.AddTransientHttpErrorPolicy(builder => - // retry 3 times - builder.WaitAndRetryAsync(3, i => TimeSpan.FromSeconds(Math.Pow(2, i)))); - } - else - { - configureHttpClientBuilder.Invoke(httpClientBuilder); - } var interceptorType = typeof(DynamicHttpProxyInterceptor<>).MakeGenericType(type); services.AddTransient(interceptorType); diff --git a/framework/src/Volo.Abp.Http/Volo.Abp.Http.csproj b/framework/src/Volo.Abp.Http/Volo.Abp.Http.csproj index df1e907450..57f447604e 100644 --- a/framework/src/Volo.Abp.Http/Volo.Abp.Http.csproj +++ b/framework/src/Volo.Abp.Http/Volo.Abp.Http.csproj @@ -16,6 +16,7 @@ + \ No newline at end of file diff --git a/framework/src/Volo.Abp.Http/Volo/Abp/Http/AbpHttpModule.cs b/framework/src/Volo.Abp.Http/Volo/Abp/Http/AbpHttpModule.cs index 171f54b85f..6cccb5ff6d 100644 --- a/framework/src/Volo.Abp.Http/Volo/Abp/Http/AbpHttpModule.cs +++ b/framework/src/Volo.Abp.Http/Volo/Abp/Http/AbpHttpModule.cs @@ -1,12 +1,14 @@ using Volo.Abp.Http.ProxyScripting.Configuration; using Volo.Abp.Http.ProxyScripting.Generators.JQuery; using Volo.Abp.Json; +using Volo.Abp.Minify; using Volo.Abp.Modularity; namespace Volo.Abp.Http { [DependsOn(typeof(AbpHttpAbstractionsModule))] [DependsOn(typeof(AbpJsonModule))] + [DependsOn(typeof(AbpMinifyModule))] public class AbpHttpModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) diff --git a/framework/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/ProxyScriptManager.cs b/framework/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/ProxyScriptManager.cs index 1b89de2b3a..858b78a57f 100644 --- a/framework/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/ProxyScriptManager.cs +++ b/framework/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/ProxyScriptManager.cs @@ -7,6 +7,7 @@ using Volo.Abp.Http.Modeling; using Volo.Abp.Http.ProxyScripting.Configuration; using Volo.Abp.Http.ProxyScripting.Generators; using Volo.Abp.Json; +using Volo.Abp.Minify.Scripts; namespace Volo.Abp.Http.ProxyScripting { @@ -17,18 +18,21 @@ namespace Volo.Abp.Http.ProxyScripting private readonly IJsonSerializer _jsonSerializer; private readonly IProxyScriptManagerCache _cache; private readonly AbpApiProxyScriptingOptions _options; + private readonly IJavascriptMinifier _javascriptMinifier; public ProxyScriptManager( IApiDescriptionModelProvider modelProvider, IServiceProvider serviceProvider, IJsonSerializer jsonSerializer, IProxyScriptManagerCache cache, - IOptions options) + IOptions options, + IJavascriptMinifier javascriptMinifier) { _modelProvider = modelProvider; _serviceProvider = serviceProvider; _jsonSerializer = jsonSerializer; _cache = cache; + _javascriptMinifier = javascriptMinifier; _options = options.Value; } @@ -63,7 +67,8 @@ namespace Volo.Abp.Http.ProxyScripting using (var scope = _serviceProvider.CreateScope()) { - return scope.ServiceProvider.GetRequiredService(generatorType).As().CreateScript(apiModel); + var script = scope.ServiceProvider.GetRequiredService(generatorType).As().CreateScript(apiModel); + return scriptingModel.Minify ? _javascriptMinifier.Minify(script) : script; } } diff --git a/framework/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/ProxyScriptingModel.cs b/framework/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/ProxyScriptingModel.cs index 5ab85a781b..6815c01ce5 100644 --- a/framework/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/ProxyScriptingModel.cs +++ b/framework/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/ProxyScriptingModel.cs @@ -8,6 +8,8 @@ namespace Volo.Abp.Http.ProxyScripting public bool UseCache { get; set; } + public bool Minify { get; set; } + public string[] Modules { get; set; } public string[] Controllers { get; set; } @@ -16,10 +18,11 @@ namespace Volo.Abp.Http.ProxyScripting public IDictionary Properties { get; set; } - public ProxyScriptingModel(string generatorType, bool useCache = true) + public ProxyScriptingModel(string generatorType, bool useCache = true, bool minify = false) { GeneratorType = generatorType; UseCache = useCache; + Minify = minify; Properties = new Dictionary(); } diff --git a/framework/src/Volo.Abp.Minify/Volo.Abp.Minify.csproj b/framework/src/Volo.Abp.Minify/Volo.Abp.Minify.csproj new file mode 100644 index 0000000000..6abb3fcc37 --- /dev/null +++ b/framework/src/Volo.Abp.Minify/Volo.Abp.Minify.csproj @@ -0,0 +1,24 @@ + + + + + + netstandard2.0 + Volo.Abp.Minify + Volo.Abp.Minify + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; + false + false + false + + + + + + + + + + + + \ No newline at end of file diff --git a/framework/src/Volo.Abp.Minify/Volo/Abp/Minify/AbpMinifyModule.cs b/framework/src/Volo.Abp.Minify/Volo/Abp/Minify/AbpMinifyModule.cs new file mode 100644 index 0000000000..3670eb5e42 --- /dev/null +++ b/framework/src/Volo.Abp.Minify/Volo/Abp/Minify/AbpMinifyModule.cs @@ -0,0 +1,8 @@ +using Volo.Abp.Modularity; + +namespace Volo.Abp.Minify +{ + public class AbpMinifyModule : AbpModule + { + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Minify/Volo/Abp/Minify/Html/IHtmlMinifier.cs b/framework/src/Volo.Abp.Minify/Volo/Abp/Minify/Html/IHtmlMinifier.cs new file mode 100644 index 0000000000..f09a378bb9 --- /dev/null +++ b/framework/src/Volo.Abp.Minify/Volo/Abp/Minify/Html/IHtmlMinifier.cs @@ -0,0 +1,7 @@ +namespace Volo.Abp.Minify.Html +{ + public interface IHtmlMinifier : IMinifier + { + + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/IMinifier.cs b/framework/src/Volo.Abp.Minify/Volo/Abp/Minify/IMinifier.cs similarity index 67% rename from framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/IMinifier.cs rename to framework/src/Volo.Abp.Minify/Volo/Abp/Minify/IMinifier.cs index 8b2390d7bb..6e298d4d82 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/IMinifier.cs +++ b/framework/src/Volo.Abp.Minify/Volo/Abp/Minify/IMinifier.cs @@ -1,4 +1,4 @@ -namespace Volo.Abp.AspNetCore.Mvc.UI.Minification +namespace Volo.Abp.Minify { public interface IMinifier { diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/NUglify/NUglifyCssMinifier.cs b/framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyCssMinifier.cs similarity index 69% rename from framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/NUglify/NUglifyCssMinifier.cs rename to framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyCssMinifier.cs index e1e0ba4236..a84f8b6e5d 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/NUglify/NUglifyCssMinifier.cs +++ b/framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyCssMinifier.cs @@ -1,7 +1,7 @@ using NUglify; -using Volo.Abp.AspNetCore.Mvc.UI.Minification.Styles; +using Volo.Abp.Minify.Styles; -namespace Volo.Abp.AspNetCore.Mvc.UI.Minification.NUglify +namespace Volo.Abp.Minify.NUglify { public class NUglifyCssMinifier : NUglifyMinifierBase, ICssMinifier { diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/NUglify/NUglifyException.cs b/framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyException.cs similarity index 91% rename from framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/NUglify/NUglifyException.cs rename to framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyException.cs index a5f36340a8..cb24f7812e 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/NUglify/NUglifyException.cs +++ b/framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyException.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Runtime.Serialization; using NUglify; -namespace Volo.Abp.AspNetCore.Mvc.UI.Minification.NUglify +namespace Volo.Abp.Minify.NUglify { public class NUglifyException : AbpException { diff --git a/framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyHtmlMinifier.cs b/framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyHtmlMinifier.cs new file mode 100644 index 0000000000..4947644278 --- /dev/null +++ b/framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyHtmlMinifier.cs @@ -0,0 +1,13 @@ +using NUglify; +using Volo.Abp.Minify.Html; + +namespace Volo.Abp.Minify.NUglify +{ + public class NUglifyHtmlMinifier : NUglifyMinifierBase, IHtmlMinifier + { + protected override UglifyResult UglifySource(string source, string fileName) + { + return Uglify.Html(source, sourceFileName: fileName); + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/NUglify/NUglifyJavascriptMinifier.cs b/framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyJavascriptMinifier.cs similarity index 60% rename from framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/NUglify/NUglifyJavascriptMinifier.cs rename to framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyJavascriptMinifier.cs index 7224acd5a0..8a4a7a9dd4 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/NUglify/NUglifyJavascriptMinifier.cs +++ b/framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyJavascriptMinifier.cs @@ -1,9 +1,7 @@ using NUglify; -using NUglify.JavaScript; -using Volo.Abp.AspNetCore.Mvc.UI.Minification.Scripts; -using Volo.Abp.DependencyInjection; +using Volo.Abp.Minify.Scripts; -namespace Volo.Abp.AspNetCore.Mvc.UI.Minification.NUglify +namespace Volo.Abp.Minify.NUglify { public class NUglifyJavascriptMinifier : NUglifyMinifierBase, IJavascriptMinifier { diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/NUglify/NUglifyMinifierBase.cs b/framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyMinifierBase.cs similarity index 94% rename from framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/NUglify/NUglifyMinifierBase.cs rename to framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyMinifierBase.cs index b6fd576603..6f52e383a6 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/NUglify/NUglifyMinifierBase.cs +++ b/framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyMinifierBase.cs @@ -4,7 +4,7 @@ using System.Linq; using NUglify; using Volo.Abp.DependencyInjection; -namespace Volo.Abp.AspNetCore.Mvc.UI.Minification.NUglify +namespace Volo.Abp.Minify.NUglify { public abstract class NUglifyMinifierBase : IMinifier, ITransientDependency { diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/Scripts/IJavascriptMinifier.cs b/framework/src/Volo.Abp.Minify/Volo/Abp/Minify/Scripts/IJavascriptMinifier.cs similarity index 53% rename from framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/Scripts/IJavascriptMinifier.cs rename to framework/src/Volo.Abp.Minify/Volo/Abp/Minify/Scripts/IJavascriptMinifier.cs index 84dfe9dd4e..319cc3e9ba 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/Scripts/IJavascriptMinifier.cs +++ b/framework/src/Volo.Abp.Minify/Volo/Abp/Minify/Scripts/IJavascriptMinifier.cs @@ -1,4 +1,4 @@ -namespace Volo.Abp.AspNetCore.Mvc.UI.Minification.Scripts +namespace Volo.Abp.Minify.Scripts { public interface IJavascriptMinifier : IMinifier { diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/Styles/ICssMinifier.cs b/framework/src/Volo.Abp.Minify/Volo/Abp/Minify/Styles/ICssMinifier.cs similarity index 51% rename from framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/Styles/ICssMinifier.cs rename to framework/src/Volo.Abp.Minify/Volo/Abp/Minify/Styles/ICssMinifier.cs index 42935b7c65..4e231ca0e4 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Minification/Styles/ICssMinifier.cs +++ b/framework/src/Volo.Abp.Minify/Volo/Abp/Minify/Styles/ICssMinifier.cs @@ -1,4 +1,4 @@ -namespace Volo.Abp.AspNetCore.Mvc.UI.Minification.Styles +namespace Volo.Abp.Minify.Styles { public interface ICssMinifier : IMinifier { diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ProxyScripting/AbpServiceProxiesController_Tests.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ProxyScripting/AbpServiceProxiesController_Tests.cs index 10fa9bd3e7..bd7366b931 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ProxyScripting/AbpServiceProxiesController_Tests.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ProxyScripting/AbpServiceProxiesController_Tests.cs @@ -9,8 +9,19 @@ namespace Volo.Abp.AspNetCore.Mvc.ProxyScripting [Fact] public async Task GetAll() { - var script = await GetResponseAsStringAsync("/Abp/ServiceProxyScript/"); + var script = await GetResponseAsStringAsync("/Abp/ServiceProxyScript?minify=true"); script.Length.ShouldBeGreaterThan(0); } + + [Fact] + public async Task GetAllWithMinify() + { + var script = await GetResponseAsStringAsync("/Abp/ServiceProxyScript"); + var minifyScript = await GetResponseAsStringAsync("/Abp/ServiceProxyScript?minify=true"); + + script.Length.ShouldBeGreaterThan(0); + minifyScript.Length.ShouldBeGreaterThan(0); + minifyScript.Length.ShouldBeLessThan(script.Length); + } } } diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo/Abp/AspNetCore/Mvc/UI/Minification/NUglify/JavascriptMinifier_Tests.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo/Abp/AspNetCore/Mvc/UI/Minification/NUglify/JavascriptMinifier_Tests.cs deleted file mode 100644 index ca04a8c929..0000000000 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo/Abp/AspNetCore/Mvc/UI/Minification/NUglify/JavascriptMinifier_Tests.cs +++ /dev/null @@ -1,26 +0,0 @@ -using Shouldly; -using Xunit; - -namespace Volo.Abp.AspNetCore.Mvc.UI.Minification.NUglify -{ - public class NUglifyJavascriptMinifier_Tests : AbpAspNetCoreMvcUiTestBase - { - private readonly NUglifyJavascriptMinifier _nUglifyJavascriptMinifier; - - public NUglifyJavascriptMinifier_Tests() - { - _nUglifyJavascriptMinifier = GetRequiredService(); - } - - [Fact] - public void Should_Minify_Simple_Code() - { - const string source = "var x = 5; var y = 6;"; - - var minified = _nUglifyJavascriptMinifier.Minify(source); - - minified.Length.ShouldBeGreaterThan(0); - minified.Length.ShouldBeLessThan(source.Length); - } - } -} diff --git a/framework/test/Volo.Abp.Minify.Tests/Volo.Abp.Minify.Tests.csproj b/framework/test/Volo.Abp.Minify.Tests/Volo.Abp.Minify.Tests.csproj new file mode 100644 index 0000000000..57a7f4ea01 --- /dev/null +++ b/framework/test/Volo.Abp.Minify.Tests/Volo.Abp.Minify.Tests.csproj @@ -0,0 +1,16 @@ + + + + + + netcoreapp3.0 + + + + + + + + + + \ No newline at end of file diff --git a/framework/test/Volo.Abp.Minify.Tests/Volo/Abp/Minify/AbpMinifyTestModule.cs b/framework/test/Volo.Abp.Minify.Tests/Volo/Abp/Minify/AbpMinifyTestModule.cs new file mode 100644 index 0000000000..625d06c950 --- /dev/null +++ b/framework/test/Volo.Abp.Minify.Tests/Volo/Abp/Minify/AbpMinifyTestModule.cs @@ -0,0 +1,11 @@ +using Volo.Abp.Modularity; + +namespace Volo.Abp.Minify +{ + [DependsOn( + typeof(AbpMinifyModule), + typeof(AbpTestBaseModule))] + public class AbpMinifyTestModule : AbpModule + { + } +} \ No newline at end of file diff --git a/framework/test/Volo.Abp.Minify.Tests/Volo/Abp/Minify/NUglify/CssMinifier_Tests.cs b/framework/test/Volo.Abp.Minify.Tests/Volo/Abp/Minify/NUglify/CssMinifier_Tests.cs new file mode 100644 index 0000000000..c71be3450b --- /dev/null +++ b/framework/test/Volo.Abp.Minify.Tests/Volo/Abp/Minify/NUglify/CssMinifier_Tests.cs @@ -0,0 +1,28 @@ +using Shouldly; +using Volo.Abp.Minify.Styles; +using Xunit; + +namespace Volo.Abp.Minify.NUglify +{ + public class CssMinifier_Tests : AbpIntegratedTest + { + private readonly ICssMinifier _cssMinifier; + + public CssMinifier_Tests() + { + _cssMinifier = GetRequiredService(); + } + + [Fact] + public void Should_Minify_Simple_Code() + { + const string source = "div { color: #FFF; }"; + + var minified = _cssMinifier.Minify(source); + + minified.Length.ShouldBeGreaterThan(0); + minified.Length.ShouldBeLessThan(source.Length); + } + } + +} diff --git a/framework/test/Volo.Abp.Minify.Tests/Volo/Abp/Minify/NUglify/HtmlMinifier_Tests.cs b/framework/test/Volo.Abp.Minify.Tests/Volo/Abp/Minify/NUglify/HtmlMinifier_Tests.cs new file mode 100644 index 0000000000..88da207d0c --- /dev/null +++ b/framework/test/Volo.Abp.Minify.Tests/Volo/Abp/Minify/NUglify/HtmlMinifier_Tests.cs @@ -0,0 +1,27 @@ +using Shouldly; +using Volo.Abp.Minify.Html; +using Xunit; + +namespace Volo.Abp.Minify.NUglify +{ + public class HtmlMinifier_Tests : AbpIntegratedTest + { + private readonly IHtmlMinifier _htmlMinifier; + + public HtmlMinifier_Tests() + { + _htmlMinifier = GetRequiredService(); + } + + [Fact] + public void Should_Minify_Simple_Code() + { + const string source = "

This is a text

"; + + var minified = _htmlMinifier.Minify(source); + + minified.Length.ShouldBeGreaterThan(0); + minified.Length.ShouldBeLessThan(source.Length); + } + } +} \ No newline at end of file diff --git a/framework/test/Volo.Abp.Minify.Tests/Volo/Abp/Minify/NUglify/JavascriptMinifier_Tests.cs b/framework/test/Volo.Abp.Minify.Tests/Volo/Abp/Minify/NUglify/JavascriptMinifier_Tests.cs new file mode 100644 index 0000000000..7ebcd65fc3 --- /dev/null +++ b/framework/test/Volo.Abp.Minify.Tests/Volo/Abp/Minify/NUglify/JavascriptMinifier_Tests.cs @@ -0,0 +1,28 @@ +using Shouldly; +using Volo.Abp.Minify.Scripts; +using Xunit; + +namespace Volo.Abp.Minify.NUglify +{ + public class JavascriptMinifier_Tests : AbpIntegratedTest + { + private readonly IJavascriptMinifier _javascriptMinifier; + + public JavascriptMinifier_Tests() + { + _javascriptMinifier = GetRequiredService(); + } + + [Fact] + public void Should_Minify_Simple_Code() + { + const string source = "var x = 5; var y = 6;"; + + var minified = _javascriptMinifier.Minify(source); + + minified.Length.ShouldBeGreaterThan(0); + minified.Length.ShouldBeLessThan(source.Length); + } + } + +} diff --git a/npm/packs/anchor-js/package.json b/npm/packs/anchor-js/package.json index 4b9663d0b8..499a6e680d 100644 --- a/npm/packs/anchor-js/package.json +++ b/npm/packs/anchor-js/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "@abp/core": "^1.0.3", - "anchor-js": "^4.1.1" + "anchor-js": "^4.2.2" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" } diff --git a/npm/packs/aspnetcore.mvc.ui/package.json b/npm/packs/aspnetcore.mvc.ui/package.json index e953a3d279..7133f5e1b3 100644 --- a/npm/packs/aspnetcore.mvc.ui/package.json +++ b/npm/packs/aspnetcore.mvc.ui/package.json @@ -5,12 +5,12 @@ "access": "public" }, "dependencies": { - "ansi-colors": "^3.2.4", + "ansi-colors": "^4.1.1", "extend-object": "^1.0.0", "gulp": "^4.0.2", "merge-stream": "^2.0.0", "path": "^0.12.7", - "rimraf": "^2.6.3" + "rimraf": "^3.0.0" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" } diff --git a/npm/packs/chart.js/package.json b/npm/packs/chart.js/package.json index 94462a4f9a..e223a8bcf1 100644 --- a/npm/packs/chart.js/package.json +++ b/npm/packs/chart.js/package.json @@ -5,7 +5,7 @@ "access": "public" }, "dependencies": { - "chart.js": "^2.8.0" + "chart.js": "^2.9.3" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" } diff --git a/npm/packs/codemirror/package.json b/npm/packs/codemirror/package.json index 4ccb0b4263..4bfc73dd9b 100644 --- a/npm/packs/codemirror/package.json +++ b/npm/packs/codemirror/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "@abp/core": "^1.0.3", - "codemirror": "^5.38.0" + "codemirror": "^5.49.2" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" } diff --git a/npm/packs/flag-icon-css/package.json b/npm/packs/flag-icon-css/package.json index 473684836f..5c3897358a 100644 --- a/npm/packs/flag-icon-css/package.json +++ b/npm/packs/flag-icon-css/package.json @@ -5,7 +5,7 @@ "access": "public" }, "dependencies": { - "flag-icon-css": "^3.4.2" + "flag-icon-css": "^3.4.5" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" } diff --git a/npm/packs/luxon/package.json b/npm/packs/luxon/package.json index feb56ce7ba..a19990b66a 100644 --- a/npm/packs/luxon/package.json +++ b/npm/packs/luxon/package.json @@ -5,7 +5,7 @@ "access": "public" }, "dependencies": { - "luxon": "^1.17.3" + "luxon": "^1.21.3" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" } diff --git a/npm/packs/markdown-it/package.json b/npm/packs/markdown-it/package.json index 5506c4db7f..afc3a35cb5 100644 --- a/npm/packs/markdown-it/package.json +++ b/npm/packs/markdown-it/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "@abp/core": "^1.0.3", - "markdown-it": "^8.4.1" + "markdown-it": "^10.0.0" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" } diff --git a/npm/packs/select2/package.json b/npm/packs/select2/package.json index c12965256f..e330d3d426 100644 --- a/npm/packs/select2/package.json +++ b/npm/packs/select2/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "@abp/core": "^1.0.3", - "select2": "^4.0.11" + "select2": "^4.0.12" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" } diff --git a/npm/packs/tui-editor/package.json b/npm/packs/tui-editor/package.json index 94ad658f7b..e0f3b44a1b 100644 --- a/npm/packs/tui-editor/package.json +++ b/npm/packs/tui-editor/package.json @@ -9,7 +9,7 @@ "@abp/highlight.js": "^1.0.3", "@abp/jquery": "^1.0.3", "@abp/markdown-it": "^1.0.3", - "tui-editor": "^1.4.7" + "tui-editor": "^1.4.8" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" } diff --git a/nupkg/common.ps1 b/nupkg/common.ps1 index b08cda26e2..eeac13eac8 100644 --- a/nupkg/common.ps1 +++ b/nupkg/common.ps1 @@ -86,6 +86,7 @@ $projects = ( "framework/src/Volo.Abp.MemoryDb", "framework/src/Volo.Abp.MongoDB", "framework/src/Volo.Abp.MultiTenancy", + "framework/src/Volo.Abp.Minify", "framework/src/Volo.Abp.ObjectMapping", "framework/src/Volo.Abp.RabbitMQ", "framework/src/Volo.Abp.Security",