Browse Source

Log the original file name on uglifier errors.

pull/3559/merge
Halil İbrahim Kalkan 6 years ago
parent
commit
53d43ccb3d
  1. 6
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundlerBase.cs
  2. 7
      framework/src/Volo.Abp.Minify/Volo/Abp/Minify/IMinifier.cs
  3. 18
      framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyMinifierBase.cs

6
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundlerBase.cs

@ -85,7 +85,11 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling
Logger.LogDebug($"- {fileName} ({nonMinifiedSize} bytes) - non minified, minifying...");
fileContent = Minifier.Minify(fileContent, context.BundleRelativePath);
fileContent = Minifier.Minify(
fileContent,
context.BundleRelativePath,
fileName
);
Logger.LogInformation($" > Minified {fileName} ({nonMinifiedSize} bytes -> {fileContent.Length} bytes)");

7
framework/src/Volo.Abp.Minify/Volo/Abp/Minify/IMinifier.cs

@ -1,7 +1,12 @@
using JetBrains.Annotations;
namespace Volo.Abp.Minify
{
public interface IMinifier
{
string Minify(string source, string fileName = null);
string Minify(
string source,
[CanBeNull] string fileName = null,
[CanBeNull] string originalFileName = null);
}
}

18
framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyMinifierBase.cs

@ -8,21 +8,31 @@ namespace Volo.Abp.Minify.NUglify
{
public abstract class NUglifyMinifierBase : IMinifier, ITransientDependency
{
private static void CheckErrors(UglifyResult result)
private static void CheckErrors(UglifyResult result, string originalFileName)
{
if (result.HasErrors)
{
var errorMessage = "There are some errors on uglifying the given source code!";
if (originalFileName != null)
{
errorMessage += " Original file: " + originalFileName;
}
throw new NUglifyException(
$"There are some errors on uglifying the given source code!{Environment.NewLine}{result.Errors.Select(err => err.ToString()).JoinAsString(Environment.NewLine)}",
$"{errorMessage}{Environment.NewLine}{result.Errors.Select(err => err.ToString()).JoinAsString(Environment.NewLine)}",
result.Errors
);
}
}
public string Minify(string source, string fileName = null)
public string Minify(
string source,
string fileName = null,
string originalFileName = null)
{
var result = UglifySource(source, fileName);
CheckErrors(result);
CheckErrors(result, originalFileName);
return result.Code;
}

Loading…
Cancel
Save