From 2bc9bf092fe2710d8dcf6873e72c86f58ddcf1b5 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Mon, 18 Jun 2018 13:46:51 +0300 Subject: [PATCH] Refactor bundling. Add pre and post bundle configuration methods. --- .../Bundling/BundleConfigurationCollection.cs | 6 +++++- .../UI/Bundling/BundleConfigurationContext.cs | 1 + .../Bundling/BundleConfigurationExtensions.cs | 2 +- .../Mvc/UI/Bundling/BundleContributor.cs | 17 +++++++++++++++-- .../UI/Bundling/BundleContributorCollection.cs | 16 ++++++++-------- .../AspNetCore/Mvc/UI/Bundling/BundleManager.cs | 12 ++++++------ .../Mvc/UI/Bundling/IBundleContributor.cs | 7 ------- .../TagHelpers/AbpBundleItemTagHelper.cs | 2 +- ...vice.cs => AbpBundleItemTagHelperService.cs} | 4 ++-- ...leTagHelperBase.cs => AbpBundleTagHelper.cs} | 4 ++-- ...viceBase.cs => AbpBundleTagHelperService.cs} | 4 ++-- .../TagHelpers/AbpScriptBundleTagHelper.cs | 2 +- .../AbpScriptBundleTagHelperService.cs | 6 ++---- .../TagHelpers/AbpScriptTagHelperService.cs | 6 ++---- .../TagHelpers/AbpStyleBundleTagHelper.cs | 2 +- .../AbpStyleBundleTagHelperService.cs | 2 +- .../TagHelpers/AbpStyleTagHelperService.cs | 2 +- .../AbpTagHelperResourceService.cs | 0 .../{Internal => }/AbpTagHelperScriptService.cs | 2 +- .../{Internal => }/AbpTagHelperStyleService.cs | 0 .../Resources/IWebRequestBundleCoordinator.cs | 2 +- 21 files changed, 53 insertions(+), 46 deletions(-) delete mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/IBundleContributor.cs rename src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/{AbpTagHelperResourceItemService.cs => AbpBundleItemTagHelperService.cs} (86%) rename src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/{AbpBundleTagHelperBase.cs => AbpBundleTagHelper.cs} (70%) rename src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/{AbpBundleTagHelperServiceBase.cs => AbpBundleTagHelperService.cs} (86%) rename src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/{Internal => }/AbpTagHelperResourceService.cs (100%) rename src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/{Internal => }/AbpTagHelperScriptService.cs (94%) rename src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/{Internal => }/AbpTagHelperStyleService.cs (100%) diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleConfigurationCollection.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleConfigurationCollection.cs index 2770305aa5..3441227ad0 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleConfigurationCollection.cs +++ b/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; } diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleConfigurationContext.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleConfigurationContext.cs index 735ce70492..5f70a91b23 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleConfigurationContext.cs +++ b/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 Files { get; } + public IServiceProvider ServiceProvider { get; } public BundleConfigurationContext(IServiceProvider serviceProvider) diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleConfigurationExtensions.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleConfigurationExtensions.cs index 227653bdc9..b53f54af7c 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleConfigurationExtensions.cs +++ b/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)); diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleContributor.cs index ba5cb820cb..ac103046c5 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleContributor.cs +++ b/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) + { + + } } } \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleContributorCollection.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleContributorCollection.cs index 923755309c..1186086909 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleContributorCollection.cs +++ b/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 _contributors; + private readonly List _contributors; public BundleContributorCollection() { - _contributors = new List(); + _contributors = new List(); } - public void Add(IBundleContributor contributor) + public void Add(BundleContributor contributor) { _contributors.Add(contributor); } public void Add() - 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 GetAll() + public IReadOnlyList 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) { diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleManager.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleManager.cs index 782e7fc383..3732a7cffd 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleManager.cs +++ b/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(); + var contributors = new List(); var context = new BundleConfigurationContext(scope.ServiceProvider); AddContributorsWithBaseBundles(contributors, bundles, context, bundleName); - foreach (var contributor in contributors) - { - contributor.ConfigureBundle(context); - } + contributors.ForEach(c => c.PreConfigureBundle(context)); + contributors.ForEach(c => c.ConfigureBundle(context)); + contributors.ForEach(c => c.PostConfigureBundle(context)); return context.Files; //TODO: Distinct? } } - protected virtual void AddContributorsWithBaseBundles(List contributors, BundleConfigurationCollection bundles, BundleConfigurationContext context, string bundleName) + protected virtual void AddContributorsWithBaseBundles(List contributors, BundleConfigurationCollection bundles, BundleConfigurationContext context, string bundleName) { var bundleConfiguration = bundles.Get(bundleName); diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/IBundleContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/IBundleContributor.cs deleted file mode 100644 index 05306e38c8..0000000000 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/IBundleContributor.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling -{ - public interface IBundleContributor - { - void ConfigureBundle(BundleConfigurationContext context); - } -} diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleItemTagHelper.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleItemTagHelper.cs index ae0361eeac..ea9980e183 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleItemTagHelper.cs +++ b/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 : AbpTagHelper, IBundleItemTagHelper where TTagHelper : AbpTagHelper, IBundleItemTagHelper - where TTagHelperService: AbpTagHelperResourceItemService + where TTagHelperService: AbpBundleItemTagHelperService { /// /// A file path. diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceItemService.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleItemTagHelperService.cs similarity index 86% rename from src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceItemService.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleItemTagHelperService.cs index 1aa67ad02e..fc59051720 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceItemService.cs +++ b/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 : AbpTagHelperService + public abstract class AbpBundleItemTagHelperService : AbpTagHelperService where TTagHelper : TagHelper, IBundleItemTagHelper { protected AbpTagHelperResourceService ResourceService { get; } - protected AbpTagHelperResourceItemService(AbpTagHelperResourceService resourceService) + protected AbpBundleItemTagHelperService(AbpTagHelperResourceService resourceService) { ResourceService = resourceService; } diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleTagHelperBase.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleTagHelper.cs similarity index 70% rename from src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleTagHelperBase.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleTagHelper.cs index 92b4c4fc52..52338542c9 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleTagHelperBase.cs +++ b/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 : AbpTagHelper, IBundleTagHelper + public abstract class AbpBundleTagHelper : AbpTagHelper, IBundleTagHelper where TTagHelper : AbpTagHelper where TService : class, IAbpTagHelperService { public string Name { get; set; } - protected AbpBundleTagHelperBase(TService service) + protected AbpBundleTagHelper(TService service) : base(service) { diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleTagHelperServiceBase.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleTagHelperService.cs similarity index 86% rename from src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleTagHelperServiceBase.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleTagHelperService.cs index 0e4a6c3b47..a8eadce1e8 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpBundleTagHelperServiceBase.cs +++ b/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 : AbpTagHelperService + public abstract class AbpBundleTagHelperService : AbpTagHelperService where TTagHelper : TagHelper, IBundleTagHelper { protected AbpTagHelperResourceService ResourceService { get; } - protected AbpBundleTagHelperServiceBase(AbpTagHelperResourceService resourceService) + protected AbpBundleTagHelperService(AbpTagHelperResourceService resourceService) { ResourceService = resourceService; } diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpScriptBundleTagHelper.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpScriptBundleTagHelper.cs index 7ea9e341ae..1a4a9d9948 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpScriptBundleTagHelper.cs +++ b/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, IBundleTagHelper + public class AbpScriptBundleTagHelper : AbpBundleTagHelper, IBundleTagHelper { public AbpScriptBundleTagHelper(AbpScriptBundleTagHelperService service) : base(service) diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpScriptBundleTagHelperService.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpScriptBundleTagHelperService.cs index 0b32cd294f..c4b00b39cd 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpScriptBundleTagHelperService.cs +++ b/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 + public class AbpScriptBundleTagHelperService : AbpBundleTagHelperService { public AbpScriptBundleTagHelperService(AbpTagHelperScriptService resourceHelper) : base(resourceHelper) diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpScriptTagHelperService.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpScriptTagHelperService.cs index e68a7102f8..d31c7bd7ce 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpScriptTagHelperService.cs +++ b/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 + public class AbpScriptTagHelperService : AbpBundleItemTagHelperService { public AbpScriptTagHelperService(AbpTagHelperScriptService resourceService) : base(resourceService) diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpStyleBundleTagHelper.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpStyleBundleTagHelper.cs index 7809cb6f30..b9b65b426f 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpStyleBundleTagHelper.cs +++ b/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, IBundleTagHelper + public class AbpStyleBundleTagHelper : AbpBundleTagHelper, IBundleTagHelper { public AbpStyleBundleTagHelper(AbpStyleBundleTagHelperService service) : base(service) diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpStyleBundleTagHelperService.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpStyleBundleTagHelperService.cs index 5ab2aef42a..f52f3dac88 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpStyleBundleTagHelperService.cs +++ b/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 + public class AbpStyleBundleTagHelperService : AbpBundleTagHelperService { public AbpStyleBundleTagHelperService(AbpTagHelperStyleService resourceHelper) : base(resourceHelper) diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpStyleTagHelperService.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpStyleTagHelperService.cs index 15342080cc..bb828e47ae 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpStyleTagHelperService.cs +++ b/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 + public class AbpStyleTagHelperService : AbpBundleItemTagHelperService { public AbpStyleTagHelperService(AbpTagHelperStyleService resourceService) : base(resourceService) diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/Internal/AbpTagHelperResourceService.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/Internal/AbpTagHelperResourceService.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/Internal/AbpTagHelperScriptService.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperScriptService.cs similarity index 94% rename from src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/Internal/AbpTagHelperScriptService.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperScriptService.cs index 9f468893b8..0ea18da43e 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/Internal/AbpTagHelperScriptService.cs +++ b/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 { diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/Internal/AbpTagHelperStyleService.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperStyleService.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/Internal/AbpTagHelperStyleService.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperStyleService.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Resources/IWebRequestBundleCoordinator.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Resources/IWebRequestBundleCoordinator.cs index 226c641724..9928f1d6a1 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Resources/IWebRequestBundleCoordinator.cs +++ b/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 {