Browse Source

Use the original file content when an error occurs.

pull/10458/head
maliming 5 years ago
parent
commit
3ffa41d8b0
No known key found for this signature in database GPG Key ID: 96224957E51C89E
  1. 22
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundlerBase.cs
  2. 9
      framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyException.cs
  3. 22
      framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyMinifierBase.cs

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

@ -5,7 +5,6 @@ using Microsoft.Extensions.FileProviders;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Logging.Abstractions;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using Volo.Abp.AspNetCore.VirtualFileSystem;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;
using Volo.Abp.Minify; using Volo.Abp.Minify;
@ -102,13 +101,22 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling
Logger.LogDebug($"- {fileName} ({nonMinifiedSize} bytes) - non minified, minifying..."); Logger.LogDebug($"- {fileName} ({nonMinifiedSize} bytes) - non minified, minifying...");
fileContent = Minifier.Minify( try
fileContent, {
context.BundleRelativePath, fileContent = Minifier.Minify(
fileName fileContent,
); context.BundleRelativePath,
fileName
);
Logger.LogInformation($" > Minified {fileName} ({nonMinifiedSize} bytes -> {fileContent.Length} bytes)"); Logger.LogInformation($" > Minified {fileName} ({nonMinifiedSize} bytes -> {fileContent.Length} bytes)");
return fileContent;
}
catch (Exception ex)
{
Logger.LogWarning($"Unable to minify the file: {fileName}. Return file content without minification.", ex);
}
return fileContent; return fileContent;
} }

9
framework/src/Volo.Abp.Minify/Volo/Abp/Minify/NUglify/NUglifyException.cs

@ -1,3 +1,4 @@
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Runtime.Serialization; using System.Runtime.Serialization;
using NUglify; using NUglify;
@ -14,6 +15,12 @@ namespace Volo.Abp.Minify.NUglify
Errors = errors; Errors = errors;
} }
public NUglifyException(string message, Exception innerException)
: base(message, innerException)
{
}
/// <summary> /// <summary>
/// Constructor for serializing. /// Constructor for serializing.
/// </summary> /// </summary>
@ -23,4 +30,4 @@ namespace Volo.Abp.Minify.NUglify
} }
} }
} }

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

@ -31,11 +31,25 @@ namespace Volo.Abp.Minify.NUglify
string fileName = null, string fileName = null,
string originalFileName = null) string originalFileName = null)
{ {
var result = UglifySource(source, fileName); try
CheckErrors(result, originalFileName); {
return result.Code; var result = UglifySource(source, fileName);
CheckErrors(result, originalFileName);
return result.Code;
}
catch (Exception e)
{
var errorMessage = "There is an error in uglifying the given source code!";
if (originalFileName != null)
{
errorMessage += " Original file: " + originalFileName;
}
throw new NUglifyException($"{errorMessage}{Environment.NewLine}{e.Message}", e);
}
} }
protected abstract UglifyResult UglifySource(string source, string fileName); protected abstract UglifyResult UglifySource(string source, string fileName);
} }
} }

Loading…
Cancel
Save