Merge pull request #18131 from abpframework/salihozkara/ImproveBundleFile

improve bundle file
pull/18139/head
maliming 2 years ago committed by GitHub
commit b128006b3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -2,11 +2,11 @@ using System;
namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling; namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling;
public class BundleFile public class BundleFile : IEquatable<BundleFile>, IComparable<BundleFile>
{ {
public string FileName { get; set; } public string FileName { get; }
public bool IsExternalFile { get; set; } public bool IsExternalFile { get; }
public BundleFile(string fileName) public BundleFile(string fileName)
{ {
@ -28,4 +28,59 @@ public class BundleFile
{ {
return new BundleFile(fileName); return new BundleFile(fileName);
} }
public bool Equals(BundleFile? other)
{
if (ReferenceEquals(null, other))
{
return false;
}
if (ReferenceEquals(this, other))
{
return true;
}
return FileName == other.FileName;
}
public override bool Equals(object? obj)
{
if (ReferenceEquals(null, obj))
{
return false;
}
if (ReferenceEquals(this, obj))
{
return true;
}
if (obj.GetType() != this.GetType())
{
return false;
}
return Equals((BundleFile)obj);
}
public override int GetHashCode()
{
return FileName.GetHashCode();
}
public int CompareTo(BundleFile? other)
{
if (ReferenceEquals(this, other))
{
return 0;
}
if (ReferenceEquals(null, other))
{
return 1;
}
return string.Compare(FileName, other.FileName, StringComparison.Ordinal);
}
} }

@ -1,5 +1,4 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using Volo.Abp.AspNetCore.Mvc.UI.Bundling; using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
namespace Volo.Docs.Bundling namespace Volo.Docs.Bundling
@ -8,11 +7,7 @@ namespace Volo.Docs.Bundling
{ {
public override void ConfigureBundle(BundleConfigurationContext context) public override void ConfigureBundle(BundleConfigurationContext context)
{ {
var prismCss = context.Files.FirstOrDefault(x => x.FileName == "/libs/prismjs/themes/prism.css"); context.Files.ReplaceOne("/libs/prismjs/themes/prism.css","/libs/prismjs/themes/prism-okaidia.css");
if (prismCss != null)
{
prismCss.FileName = "/libs/prismjs/themes/prism-okaidia.css";
}
context.Files.AddIfNotContains("/libs/prismjs/plugins/line-highlight/prism-line-highlight.css"); context.Files.AddIfNotContains("/libs/prismjs/plugins/line-highlight/prism-line-highlight.css");
context.Files.AddIfNotContains("/libs/prismjs/plugins/toolbar/prism-toolbar.css"); context.Files.AddIfNotContains("/libs/prismjs/plugins/toolbar/prism-toolbar.css");
context.Files.AddIfNotContains("/libs/prismjs/plugins/diff-highlight/prism-diff-highlight.css"); context.Files.AddIfNotContains("/libs/prismjs/plugins/diff-highlight/prism-diff-highlight.css");

Loading…
Cancel
Save