Add CDN support for bundles.

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

@@ -8,7 +8,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 
 public class BundleConfigurationContext : IBundleConfigurationContext
 {
-    public List<string> Files { get; }
+    public List<BundleFile> Files { get; }
 
     public IFileProvider FileProvider { get; }
 
@@ -18,7 +18,7 @@ public class BundleConfigurationContext : IBundleConfigurationContext
 
     public BundleConfigurationContext(IServiceProvider serviceProvider, IFileProvider fileProvider)
     {
-        Files = new List<string>();
+        Files = new List<BundleFile>();
         ServiceProvider = serviceProvider;
         LazyServiceProvider = ServiceProvider.GetRequiredService<IAbpLazyServiceProvider>();
         FileProvider = fileProvider;

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

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 
@@ -10,6 +11,12 @@ public static class BundleConfigurationExtensions
         return bundleConfiguration;
     }
 
+    public static BundleConfiguration AddCdnFiles(this BundleConfiguration bundleConfiguration, params string[] files)
+    {
+        bundleConfiguration.Contributors.AddCdnFiles(files.Select(x => new BundleFile(x, true)).ToArray());
+        return bundleConfiguration;
+    }
+
     public static BundleConfiguration AddContributors(this BundleConfiguration bundleConfiguration, params IBundleContributor[] contributors)
     {
         Check.NotNull(contributors, nameof(contributors));

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleContributorCollectionExtensions.cs

@@ -6,4 +6,8 @@ public static class BundleContributorCollectionExtensions
     {
         contributors.Add(new BundleFileContributor(files));
     }
+    public static void AddCdnFiles(this BundleContributorCollection contributors, params BundleFile[] files)
+    {
+        contributors.Add(new BundleFileContributor(files));
+    }
 }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleFile.cs

@@ -0,0 +1,14 @@
+namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+
+public class BundleFile
+{
+    public string File { get; set; }
+
+    public bool IsCdn { get; set; }
+
+    public BundleFile(string file, bool isCdn = false)
+    {
+        File = file;
+        IsCdn = isCdn;
+    }
+}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleFileContributor.cs

@@ -1,22 +1,30 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 
 public class BundleFileContributor : BundleContributor
 {
-    public string[] Files { get; }
+    public List<BundleFile> Files { get; }
+
+    public BundleFileContributor(params BundleFile[] files)
+    {
+        Files = new List<BundleFile>();
+        Files.AddRange(files);
+    }
 
     public BundleFileContributor(params string[] files)
     {
-        Files = files ?? Array.Empty<string>();
+        Files = new List<BundleFile>();
+        Files.AddRange(files.Select(file => new BundleFile(file)));
     }
 
     public override void ConfigureBundle(BundleConfigurationContext context)
     {
         foreach (var file in Files)
         {
-            context.Files.AddIfNotContains(x => x.Equals(file, StringComparison.OrdinalIgnoreCase), () => file);
+            context.Files.AddIfNotContains(x => x.File.Equals(file.File, StringComparison.OrdinalIgnoreCase), () => file);
         }
     }
 }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleFileListExtensions.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+
+/// <summary>
+/// This class is used to compatible with old code.
+/// </summary>
+public static class BundleFileListExtensions
+{
+    public static void Add(this List<BundleFile> bundleFiles, params string[] files)
+    {
+        bundleFiles.AddRange(files.Select(file => new BundleFile(file)));
+    }
+
+    public static void AddRange(this List<BundleFile> bundleFiles, params string[] files)
+    {
+        bundleFiles.AddRange(files.Select(file => new BundleFile(file)));
+    }
+
+    public static void AddIfNotContains(this List<BundleFile> bundleFiles, params string[] files)
+    {
+        foreach (var file in files)
+        {
+            if (!bundleFiles.Any(x => x.File.Equals(file, StringComparison.OrdinalIgnoreCase)))
+            {
+                bundleFiles.Add(new BundleFile(file));
+            }
+        }
+    }
+}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions/Volo/Abp/AspNetCore/Mvc/UI/Bundling/IBundleConfigurationContext.cs

@@ -5,5 +5,5 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 
 public interface IBundleConfigurationContext : IServiceProviderAccessor
 {
-    List<string> Files { get; }
+    List<BundleFile> Files { get; }
 }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleCacheItem.cs

@@ -5,11 +5,11 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 
 public class BundleCacheItem
 {
-    public List<string> Files { get; }
+    public List<BundleFile> Files { get; }
 
     public List<IDisposable> WatchDisposeHandles { get; }
 
-    public BundleCacheItem(List<string> files)
+    public BundleCacheItem(List<BundleFile> files)
     {
         Files = files;
         WatchDisposeHandles = new List<IDisposable>();

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

@@ -12,7 +12,6 @@ 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;
 
@@ -56,19 +55,22 @@ public class BundleManager : IBundleManager, ITransientDependency
         Logger = NullLogger<BundleManager>.Instance;
     }
 
-    public virtual async Task<IReadOnlyList<string>> GetStyleBundleFilesAsync(string bundleName)
+    public virtual async Task<IReadOnlyList<BundleFile>> GetStyleBundleFilesAsync(string bundleName)
     {
         return await GetBundleFilesAsync(Options.StyleBundles, bundleName, StyleBundler);
     }
 
-    public virtual async Task<IReadOnlyList<string>> GetScriptBundleFilesAsync(string bundleName)
+    public virtual async Task<IReadOnlyList<BundleFile>> GetScriptBundleFilesAsync(string bundleName)
     {
         return await GetBundleFilesAsync(Options.ScriptBundles, bundleName, ScriptBundler);
     }
 
-    protected virtual async Task<IReadOnlyList<string>> GetBundleFilesAsync(BundleConfigurationCollection bundles, string bundleName, IBundler bundler)
+    protected virtual async Task<IReadOnlyList<BundleFile>> GetBundleFilesAsync(BundleConfigurationCollection bundles, string bundleName, IBundler bundler)
     {
+        var result = new List<BundleFile>();
+
         var contributors = GetContributors(bundles, bundleName);
+
         var bundleFiles = RequestResources.TryAdd(await GetBundleFilesAsync(contributors));
         var dynamicResources = RequestResources.TryAdd(await GetDynamicResourcesAsync(contributors));
 
@@ -77,16 +79,48 @@ public class BundleManager : IBundleManager, ITransientDependency
             return bundleFiles.Union(dynamicResources).ToImmutableList();
         }
 
+        var localBundleFiles = new List<string>();
+        foreach (var bundleFile in bundleFiles)
+        {
+            if (bundleFile.IsCdn)
+            {
+                if (localBundleFiles.Any())
+                {
+                    var cacheItem = AddToBundleCache(bundleName, bundler, localBundleFiles);
+                    result.AddRange(cacheItem.Files);
+                    localBundleFiles.Clear();
+                }
+
+                result.Add(bundleFile);
+            }
+            else
+            {
+                localBundleFiles.Add(bundleFile.File);
+            }
+        }
+
+        if (localBundleFiles.Any())
+        {
+            var cacheItem = AddToBundleCache(bundleName, bundler, localBundleFiles);
+            result.AddRange(cacheItem.Files);
+            localBundleFiles.Clear();
+        }
+
+        return result.Union(dynamicResources).ToImmutableList();
+    }
+
+    private BundleCacheItem AddToBundleCache(string bundleName, IBundler bundler, List<string> bundleFiles)
+    {
         var bundleRelativePath =
             Options.BundleFolderName.EnsureEndsWith('/') +
             bundleName + "." + bundleFiles.JoinAsString("|").ToMd5() + "." + bundler.FileExtension;
 
-        var cacheItem = BundleCache.GetOrAdd(bundleRelativePath, () =>
+        return BundleCache.GetOrAdd(bundleRelativePath, () =>
         {
             var cacheValue = new BundleCacheItem(
-                new List<string>
+                new List<BundleFile>
                 {
-                        "/" + bundleRelativePath
+                    new BundleFile("/" + bundleRelativePath)
                 }
             );
 
@@ -104,8 +138,6 @@ public class BundleManager : IBundleManager, ITransientDependency
 
             return cacheValue;
         });
-
-        return cacheItem.Files.Union(dynamicResources).ToImmutableList();
     }
 
     private void WatchChanges(BundleCacheItem cacheValue, List<string> files, string bundleRelativePath)
@@ -176,7 +208,7 @@ public class BundleManager : IBundleManager, ITransientDependency
         }
     }
 
-    protected async Task<List<string>> GetBundleFilesAsync(List<IBundleContributor> contributors)
+    protected async Task<List<BundleFile>> GetBundleFilesAsync(List<IBundleContributor> contributors)
     {
         var context = CreateBundleConfigurationContext();
 
@@ -198,7 +230,7 @@ public class BundleManager : IBundleManager, ITransientDependency
         return context.Files;
     }
 
-    protected virtual async Task<List<string>> GetDynamicResourcesAsync(List<IBundleContributor> contributors)
+    protected virtual async Task<List<BundleFile>> GetDynamicResourcesAsync(List<IBundleContributor> contributors)
     {
         var context = CreateBundleConfigurationContext();
 

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/IBundleManager.cs

@@ -5,7 +5,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 
 public interface IBundleManager
 {
-    Task<IReadOnlyList<string>> GetStyleBundleFilesAsync(string bundleName);
+    Task<IReadOnlyList<BundleFile>> GetStyleBundleFilesAsync(string bundleName);
 
-    Task<IReadOnlyList<string>> GetScriptBundleFilesAsync(string bundleName);
+    Task<IReadOnlyList<BundleFile>> GetScriptBundleFilesAsync(string bundleName);
 }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService.cs

@@ -3,10 +3,12 @@ using Microsoft.AspNetCore.Razor.TagHelpers;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
@@ -63,18 +65,24 @@ public abstract class AbpTagHelperResourceService : ITransientDependency
 
         foreach (var bundleFile in bundleFiles)
         {
-            var file = HostingEnvironment.WebRootFileProvider.GetFileInfo(bundleFile);
-
-            if (file == null || !file.Exists)
+            if (bundleFile.IsCdn)
             {
-                Logger.LogError($"Could not find the bundle file '{bundleFile}' for the bundle '{bundleName}'!");
-                AddErrorScript(viewContext, tagHelper, context, output, bundleFile, bundleName!);
-                continue;
+                AddHtmlTag(viewContext, tagHelper, context, output, bundleFile, null);
             }
-
-            if (file.Length > 0)
+            else
             {
-                AddHtmlTag(viewContext, tagHelper, context, output, bundleFile + "?_v=" + file.LastModified.UtcTicks);
+                var file = HostingEnvironment.WebRootFileProvider.GetFileInfo(bundleFile.File);
+                if (file == null || !file.Exists)
+                {
+                    Logger.LogError($"Could not find the bundle file '{bundleFile.File}' for the bundle '{bundleName}'!");
+                    AddErrorScript(viewContext, tagHelper, context, output, bundleFile, bundleName!);
+                    continue;
+                }
+
+                if (file.Length > 0)
+                {
+                    AddHtmlTag(viewContext, tagHelper, context, output, bundleFile, file);
+                }
             }
         }
 
@@ -84,13 +92,13 @@ public abstract class AbpTagHelperResourceService : ITransientDependency
 
     protected abstract void CreateBundle(string bundleName, List<BundleTagHelperItem> bundleItems);
 
-    protected abstract Task<IReadOnlyList<string>> GetBundleFilesAsync(string bundleName);
+    protected abstract Task<IReadOnlyList<BundleFile>> GetBundleFilesAsync(string bundleName);
 
-    protected abstract void AddHtmlTag(ViewContext viewContext, TagHelper tagHelper, TagHelperContext context, TagHelperOutput output, string file);
+    protected abstract void AddHtmlTag(ViewContext viewContext, TagHelper tagHelper, TagHelperContext context, TagHelperOutput output, BundleFile file, IFileInfo? fileInfo = null);
 
-    protected virtual void AddErrorScript(ViewContext viewContext, TagHelper tagHelper, TagHelperContext context, TagHelperOutput output, string file, string bundleName)
+    protected virtual void AddErrorScript(ViewContext viewContext, TagHelper tagHelper, TagHelperContext context, TagHelperOutput output, BundleFile file, string bundleName)
     {
-        output.Content.AppendHtml($"<script>console.log(\"%cCould not find the bundle file '{file}' for the bundle '{bundleName}'!\", 'background: yellow; font-size:20px;');</script>{Environment.NewLine}");
+        output.Content.AppendHtml($"<script>console.log(\"%cCould not find the bundle file '{file.File}' for the bundle '{bundleName}'!\", 'background: yellow; font-size:20px;');</script>{Environment.NewLine}");
     }
 
     protected virtual string GenerateBundleName(List<BundleTagHelperItem> bundleItems)

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

@@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
 
@@ -32,12 +33,12 @@ public class AbpTagHelperScriptService : AbpTagHelperResourceService
         );
     }
 
-    protected override async Task<IReadOnlyList<string>> GetBundleFilesAsync(string bundleName)
+    protected override async Task<IReadOnlyList<BundleFile>> GetBundleFilesAsync(string bundleName)
     {
         return await BundleManager.GetScriptBundleFilesAsync(bundleName);
     }
 
-    protected override void AddHtmlTag(ViewContext viewContext, TagHelper tagHelper, TagHelperContext context, TagHelperOutput output, string file)
+    protected override void AddHtmlTag(ViewContext viewContext, TagHelper tagHelper, TagHelperContext context, TagHelperOutput output, BundleFile file, IFileInfo? fileInfo = null)
     {
         var defer = tagHelper switch
         {
@@ -46,12 +47,14 @@ public class AbpTagHelperScriptService : AbpTagHelperResourceService
             _ => false
         };
 
-        var deferText = (defer || Options.DeferScriptsByDefault || Options.DeferScripts.Any(x => file.StartsWith(x, StringComparison.OrdinalIgnoreCase)))
+        var deferText = (defer || Options.DeferScriptsByDefault || Options.DeferScripts.Any(x => file.File.StartsWith(x, StringComparison.OrdinalIgnoreCase)))
                 ? "defer"
                 : string.Empty;
         var nonceText = (viewContext.HttpContext.Items.TryGetValue(AbpAspNetCoreConsts.ScriptNonceKey, out var nonce) && nonce is string nonceString && !string.IsNullOrEmpty(nonceString))
             ? $"nonce=\"{nonceString}\""
             : string.Empty;
-        output.Content.AppendHtml($"<script {deferText} {nonceText} src=\"{viewContext.GetUrlHelper().Content(file.EnsureStartsWith('~'))}\"></script>{Environment.NewLine}");
+
+        var src = file.IsCdn ? file.File : viewContext.GetUrlHelper().Content((file.File + "?_v=" + fileInfo!.LastModified.UtcTicks).EnsureStartsWith('~'));
+        output.Content.AppendHtml($"<script {deferText} {nonceText} src=\"{src}\"></script>{Environment.NewLine}");
     }
 }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperStyleService.cs

@@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
 using Volo.Abp.AspNetCore.Security;
@@ -18,7 +19,7 @@ public class AbpTagHelperStyleService : AbpTagHelperResourceService
     public AbpTagHelperStyleService(
         IBundleManager bundleManager,
         IOptions<AbpBundlingOptions> options,
-        IWebHostEnvironment hostingEnvironment, 
+        IWebHostEnvironment hostingEnvironment,
         IOptions<AbpSecurityHeadersOptions> securityHeadersOptions) : base(
             bundleManager,
             options,
@@ -36,12 +37,12 @@ public class AbpTagHelperStyleService : AbpTagHelperResourceService
         );
     }
 
-    protected override async Task<IReadOnlyList<string>> GetBundleFilesAsync(string bundleName)
+    protected override async Task<IReadOnlyList<BundleFile>> GetBundleFilesAsync(string bundleName)
     {
         return await BundleManager.GetStyleBundleFilesAsync(bundleName);
     }
 
-    protected override void AddHtmlTag(ViewContext viewContext, TagHelper tagHelper, TagHelperContext context, TagHelperOutput output, string file)
+    protected override void AddHtmlTag(ViewContext viewContext, TagHelper tagHelper, TagHelperContext context, TagHelperOutput output, BundleFile file, IFileInfo? fileInfo = null)
     {
         var preload = tagHelper switch
         {
@@ -50,15 +51,16 @@ public class AbpTagHelperStyleService : AbpTagHelperResourceService
             _ => false
         };
 
-        if (preload || Options.PreloadStylesByDefault || Options.PreloadStyles.Any(x => file.StartsWith(x, StringComparison.OrdinalIgnoreCase)))
+        var href = file.IsCdn ? file.File : viewContext.GetUrlHelper().Content((file.File + "?_v=" + fileInfo!.LastModified.UtcTicks).EnsureStartsWith('~'));
+        if (preload || Options.PreloadStylesByDefault || Options.PreloadStyles.Any(x => file.File.StartsWith(x, StringComparison.OrdinalIgnoreCase)))
         {
             output.Content.AppendHtml(SecurityHeadersOptions.UseContentSecurityPolicyScriptNonce
-                ? $"<link rel=\"preload\" href=\"{viewContext.GetUrlHelper().Content(file.EnsureStartsWith('~'))}\" as=\"style\" abp-csp-style />{Environment.NewLine}"
-                : $"<link rel=\"preload\" href=\"{viewContext.GetUrlHelper().Content(file.EnsureStartsWith('~'))}\" as=\"style\" onload=\"this.rel='stylesheet'\" />{Environment.NewLine}");
+                ? $"<link rel=\"preload\" href=\"{href}\" as=\"style\" abp-csp-style />{Environment.NewLine}"
+                : $"<link rel=\"preload\" href=\"{href}\" as=\"style\" onload=\"this.rel='stylesheet'\" />{Environment.NewLine}");
         }
         else
         {
-            output.Content.AppendHtml($"<link rel=\"stylesheet\" href=\"{viewContext.GetUrlHelper().Content(file.EnsureStartsWith('~'))}\" />{Environment.NewLine}");
+            output.Content.AppendHtml($"<link rel=\"stylesheet\" href=\"{href}\" />{Environment.NewLine}");
         }
     }
 }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Resources/IWebRequestResources.cs

@@ -1,8 +1,9 @@
 using System.Collections.Generic;
+using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Resources;
 
 public interface IWebRequestResources
 {
-    List<string> TryAdd(List<string> resources);
+    List<BundleFile> TryAdd(List<BundleFile> resources);
 }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Resources/WebRequestResources.cs

@@ -1,23 +1,24 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Http;
+using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Resources;
 
 public class WebRequestResources : IWebRequestResources, IScopedDependency
 {
-    protected Dictionary<string, List<string>> Resources { get; }
+    protected Dictionary<string, List<BundleFile>> Resources { get; }
 
     protected IHttpContextAccessor HttpContextAccessor { get; }
 
     public WebRequestResources(IHttpContextAccessor httpContextAccessor)
     {
         HttpContextAccessor = httpContextAccessor;
-        Resources = new Dictionary<string, List<string>>();
+        Resources = new Dictionary<string, List<BundleFile>>();
     }
 
-    public List<string> TryAdd(List<string> resources)
+    public List<BundleFile> TryAdd(List<BundleFile> resources)
     {
         var path = HttpContextAccessor.HttpContext?.Request?.Path ?? "";