Refactor bundling. Add pre and post bundle configuration methods.

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleConfigurationCollection.cs

@@ -32,7 +32,11 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling
 
         public BundleConfiguration GetOrNull(string bundleName)
         {
-            _bundleContributors.TryGetValue(bundleName, out var bundleConfiguration);
+            if (!_bundleContributors.TryGetValue(bundleName, out var bundleConfiguration))
+            {
+                return null;
+            }
+
             return bundleConfiguration;
         }
 

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleConfigurationContext.cs

@@ -6,6 +6,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling
     public class BundleConfigurationContext : IBundleConfigurationContext
     {
         public List<string> Files { get; }
+
         public IServiceProvider ServiceProvider { get; }
 
         public BundleConfigurationContext(IServiceProvider serviceProvider)

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleConfigurationExtensions.cs

@@ -10,7 +10,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling
             return bundleConfiguration;
         }
 
-        public static BundleConfiguration AddContributors(this BundleConfiguration bundleConfiguration, params IBundleContributor[] contributors)
+        public static BundleConfiguration AddContributors(this BundleConfiguration bundleConfiguration, params BundleContributor[] contributors)
         {
             Check.NotNull(contributors, nameof(contributors));
 

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleContributor.cs

@@ -1,7 +1,20 @@
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling
 {
-    public abstract class BundleContributor : IBundleContributor
+    public abstract class BundleContributor
     {
-        public abstract void ConfigureBundle(BundleConfigurationContext context);
+        public virtual void PreConfigureBundle(BundleConfigurationContext context)
+        {
+
+        }
+
+        public virtual void ConfigureBundle(BundleConfigurationContext context)
+        {
+
+        }
+
+        public virtual void PostConfigureBundle(BundleConfigurationContext context)
+        {
+
+        }
     }
 }

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleContributorCollection.cs

@@ -9,20 +9,20 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling
 {
     public class BundleContributorCollection
     {
-        private readonly List<IBundleContributor> _contributors;
+        private readonly List<BundleContributor> _contributors;
 
         public BundleContributorCollection()
         {
-            _contributors = new List<IBundleContributor>();
+            _contributors = new List<BundleContributor>();
         }
 
-        public void Add(IBundleContributor contributor)
+        public void Add(BundleContributor contributor)
         {
             _contributors.Add(contributor);
         }
 
         public void Add<TContributor>()
-            where TContributor : IBundleContributor, new()
+            where TContributor : BundleContributor, new()
         {
             Add(typeof(TContributor));
         }
@@ -34,7 +34,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling
             AddWithDependencies(contributorType);
         }
 
-        public IReadOnlyList<IBundleContributor> GetAll()
+        public IReadOnlyList<BundleContributor> GetAll()
         {
             return _contributors.ToImmutableList();
         }
@@ -69,14 +69,14 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling
 
         private void AddInstanceToContributors(Type contributorType)
         {
-            if (!typeof(IBundleContributor).IsAssignableFrom(contributorType))
+            if (!typeof(BundleContributor).IsAssignableFrom(contributorType))
             {
-                throw new AbpException($"Given {nameof(contributorType)} ({contributorType.AssemblyQualifiedName}) should implement the {typeof(IBundleContributor).AssemblyQualifiedName} interface!");
+                throw new AbpException($"Given {nameof(contributorType)} ({contributorType.AssemblyQualifiedName}) should implement the {typeof(BundleContributor).AssemblyQualifiedName} interface!");
             }
 
             try
             {
-                _contributors.Add((IBundleContributor)Activator.CreateInstance(contributorType));
+                _contributors.Add((BundleContributor)Activator.CreateInstance(contributorType));
             }
             catch (Exception ex)
             {

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleManager.cs

@@ -8,6 +8,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Scripts;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Styles;
+using Volo.Abp.AspNetCore.Mvc.UI.Resources;
 using Volo.Abp.AspNetCore.VirtualFileSystem;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.VirtualFileSystem;
@@ -182,21 +183,20 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling
         {
             using (var scope = _serviceProvider.CreateScope())
             {
-                var contributors = new List<IBundleContributor>();
+                var contributors = new List<BundleContributor>();
                 var context = new BundleConfigurationContext(scope.ServiceProvider);
 
                 AddContributorsWithBaseBundles(contributors, bundles, context, bundleName);
 
-                foreach (var contributor in contributors)
+                contributors.ForEach(c => c.PreConfigureBundle(context));
-                {
+                contributors.ForEach(c => c.ConfigureBundle(context));
-                    contributor.ConfigureBundle(context);
+                contributors.ForEach(c => c.PostConfigureBundle(context));
-                }
 
                 return context.Files; //TODO: Distinct?
             }
         }
 
-        protected virtual void AddContributorsWithBaseBundles(List<IBundleContributor> contributors, BundleConfigurationCollection bundles, BundleConfigurationContext context, string bundleName)
+        protected virtual void AddContributorsWithBaseBundles(List<BundleContributor> contributors, BundleConfigurationCollection bundles, BundleConfigurationContext context, string bundleName)
         {
             var bundleConfiguration = bundles.Get(bundleName);
 

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/IBundleContributor.cs

@@ -1,7 +0,0 @@
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling
-{
-    public interface IBundleContributor
-    {
-        void ConfigureBundle(BundleConfigurationContext context);
-    }
-}

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleItemTagHelper.cs

@@ -5,7 +5,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
 {
     public abstract class AbpBundleItemTagHelper<TTagHelper, TTagHelperService> : AbpTagHelper<TTagHelper, TTagHelperService>, IBundleItemTagHelper 
         where TTagHelper : AbpTagHelper<TTagHelper, TTagHelperService>, IBundleItemTagHelper
-        where TTagHelperService: AbpTagHelperResourceItemService<TTagHelper>
+        where TTagHelperService: AbpBundleItemTagHelperService<TTagHelper>
     {
         /// <summary>
         /// A file path.

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceItemService.cs → src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleItemTagHelperService.cs

@@ -5,12 +5,12 @@ using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
 {
-    public abstract class AbpTagHelperResourceItemService<TTagHelper> : AbpTagHelperService<TTagHelper>
+    public abstract class AbpBundleItemTagHelperService<TTagHelper> : AbpTagHelperService<TTagHelper>
         where TTagHelper : TagHelper, IBundleItemTagHelper
     {
         protected AbpTagHelperResourceService ResourceService { get; }
 
-        protected AbpTagHelperResourceItemService(AbpTagHelperResourceService resourceService)
+        protected AbpBundleItemTagHelperService(AbpTagHelperResourceService resourceService)
         {
             ResourceService = resourceService;
         }

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleTagHelperBase.cs → src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleTagHelper.cs

@@ -2,13 +2,13 @@
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
 {
-    public abstract class AbpBundleTagHelperBase<TTagHelper, TService> : AbpTagHelper<TTagHelper, TService>, IBundleTagHelper
+    public abstract class AbpBundleTagHelper<TTagHelper, TService> : AbpTagHelper<TTagHelper, TService>, IBundleTagHelper
         where TTagHelper : AbpTagHelper<TTagHelper, TService>
         where TService : class, IAbpTagHelperService<TTagHelper>
     {
         public string Name { get; set; }
 
-        protected AbpBundleTagHelperBase(TService service)
+        protected AbpBundleTagHelper(TService service)
             : base(service)
         {
 

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleTagHelperServiceBase.cs → src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleTagHelperService.cs

@@ -5,12 +5,12 @@ using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
 {
-    public abstract class AbpBundleTagHelperServiceBase<TTagHelper> : AbpTagHelperService<TTagHelper>
+    public abstract class AbpBundleTagHelperService<TTagHelper> : AbpTagHelperService<TTagHelper>
         where TTagHelper : TagHelper, IBundleTagHelper
     {
         protected AbpTagHelperResourceService ResourceService { get; }
 
-        protected AbpBundleTagHelperServiceBase(AbpTagHelperResourceService resourceService)
+        protected AbpBundleTagHelperService(AbpTagHelperResourceService resourceService)
         {
             ResourceService = resourceService;
         }

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpScriptBundleTagHelper.cs

@@ -3,7 +3,7 @@
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
 {
     [HtmlTargetElement("abp-script-bundle", TagStructure = TagStructure.NormalOrSelfClosing)]
-    public class AbpScriptBundleTagHelper : AbpBundleTagHelperBase<AbpScriptBundleTagHelper, AbpScriptBundleTagHelperService>, IBundleTagHelper
+    public class AbpScriptBundleTagHelper : AbpBundleTagHelper<AbpScriptBundleTagHelper, AbpScriptBundleTagHelperService>, IBundleTagHelper
     {
         public AbpScriptBundleTagHelper(AbpScriptBundleTagHelperService service)
             : base(service)

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpScriptBundleTagHelperService.cs

@@ -1,8 +1,6 @@
-using Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers.Internal;
+namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
-
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
 {
-    public class AbpScriptBundleTagHelperService : AbpBundleTagHelperServiceBase<AbpScriptBundleTagHelper>
+    public class AbpScriptBundleTagHelperService : AbpBundleTagHelperService<AbpScriptBundleTagHelper>
     {
         public AbpScriptBundleTagHelperService(AbpTagHelperScriptService resourceHelper) 
             : base(resourceHelper)

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpScriptTagHelperService.cs

@@ -1,8 +1,6 @@
-using Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers.Internal;
+namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
-
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
 {
-    public class AbpScriptTagHelperService : AbpTagHelperResourceItemService<AbpScriptTagHelper>
+    public class AbpScriptTagHelperService : AbpBundleItemTagHelperService<AbpScriptTagHelper>
     {
         public AbpScriptTagHelperService(AbpTagHelperScriptService resourceService)
             : base(resourceService)

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpStyleBundleTagHelper.cs

@@ -3,7 +3,7 @@
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
 {
     [HtmlTargetElement("abp-style-bundle", TagStructure = TagStructure.NormalOrSelfClosing)]
-    public class AbpStyleBundleTagHelper : AbpBundleTagHelperBase<AbpStyleBundleTagHelper, AbpStyleBundleTagHelperService>, IBundleTagHelper
+    public class AbpStyleBundleTagHelper : AbpBundleTagHelper<AbpStyleBundleTagHelper, AbpStyleBundleTagHelperService>, IBundleTagHelper
     {
         public AbpStyleBundleTagHelper(AbpStyleBundleTagHelperService service)
             : base(service)

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpStyleBundleTagHelperService.cs

@@ -1,6 +1,6 @@
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
 {
-    public class AbpStyleBundleTagHelperService : AbpBundleTagHelperServiceBase<AbpStyleBundleTagHelper>
+    public class AbpStyleBundleTagHelperService : AbpBundleTagHelperService<AbpStyleBundleTagHelper>
     {
         public AbpStyleBundleTagHelperService(AbpTagHelperStyleService resourceHelper) 
             : base(resourceHelper)

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpStyleTagHelperService.cs

@@ -1,6 +1,6 @@
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
 {
-    public class AbpStyleTagHelperService : AbpTagHelperResourceItemService<AbpStyleTagHelper>
+    public class AbpStyleTagHelperService : AbpBundleItemTagHelperService<AbpStyleTagHelper>
     {
         public AbpStyleTagHelperService(AbpTagHelperStyleService resourceService)
             : base(resourceService)

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/Internal/AbpTagHelperScriptService.cs → src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperScriptService.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using Volo.Abp.AspNetCore.VirtualFileSystem;
 
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers.Internal
+namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
 {
     public class AbpTagHelperScriptService : AbpTagHelperResourceService
     {

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Resources/IWebRequestBundleCoordinator.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling
+namespace Volo.Abp.AspNetCore.Mvc.UI.Resources
 {
     public interface IWebRequestResources
     {