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 115029dbe5..3b9954940c 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 @@ -46,38 +46,50 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling private void AddFileToBundle(IBundlerContext context, StringBuilder bundleContentBuilder, string fileName) { - string fileContent = null; + var fileContent = GetFileContentConsideringMinification(context, fileName); + fileContent = ProcessBeforeAddingToTheBundle(context, fileName, fileContent); + bundleContentBuilder.Append(fileContent); + } - if (context.IsMinificationEnabled && !IsMinFile(fileName)) + private string GetFileContentConsideringMinification(IBundlerContext context, string fileName) + { + var isMinFile = IsMinFile(fileName); + if (!context.IsMinificationEnabled || isMinFile) { - var minFileInfo = GetMinFileInfoOrNull(fileName); - if (minFileInfo != null) + var fileContent = GetFileInfo(context, fileName).ReadAsString(); + Logger.LogDebug($"- {fileName} ({fileContent.Length} bytes)"); + if (context.IsMinificationEnabled && isMinFile) { - Logger.LogDebug($"- {fileName} ({minFileInfo.Length} bytes) - already minified"); - fileContent = minFileInfo.ReadAsString(); + Logger.LogDebug(" > Already minified"); } + + return fileContent; } - if (fileContent == null) + var minFileInfo = GetMinFileInfoOrNull(fileName); + if (minFileInfo != null) { - fileContent = GetFileContent(context, fileName); - Logger.LogDebug($"- {fileName} ({fileContent.Length} bytes) - non minified"); - - if (context.IsMinificationEnabled) - { - var nonMinifiedSize = fileContent.Length; - fileContent = Minifier.Minify(fileContent, context.BundleRelativePath); - Logger.LogInformation($" > Minified {fileName} ({nonMinifiedSize} bytes -> {fileContent.Length} bytes)"); - } + var fileContent = minFileInfo.ReadAsString(); + Logger.LogDebug($"- {fileName}"); + Logger.LogDebug($" > Using the pre-minified file: {minFileInfo.Name} ({fileContent.Length} bytes)"); + return fileContent; } - fileContent = ProcessBeforeAddingToTheBundle(context, fileName, fileContent); - bundleContentBuilder.Append(fileContent); + return GetAndMinifyFileContent(context, fileName); } - protected virtual string GetFileContent(IBundlerContext context, string file) + private string GetAndMinifyFileContent(IBundlerContext context, string fileName) { - return GetFileInfo(context, file).ReadAsString(); + var fileContent = GetFileInfo(context, fileName).ReadAsString(); + var nonMinifiedSize = fileContent.Length; + + Logger.LogDebug($"- {fileName} ({nonMinifiedSize} bytes) - non minified, minifying..."); + + fileContent = Minifier.Minify(fileContent, context.BundleRelativePath); + + Logger.LogInformation($" > Minified {fileName} ({nonMinifiedSize} bytes -> {fileContent.Length} bytes)"); + + return fileContent; } protected virtual IFileInfo GetFileInfo(IBundlerContext context, string file)