Merge pull request #10317 from abpframework/maliming/async-load

Load script/style asynchronously.

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

@@ -20,11 +20,23 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling
         /// </summary>
         public BundlingMode Mode { get; set; } = BundlingMode.Auto;
 
+        public bool DeferScriptsByDefault { get; set; }
+
+        public List<string> DeferScripts { get; }
+
+        public bool PreloadStylesByDefault { get; set; }
+
+        public List<string> PreloadStyles { get; }
+
         public AbpBundlingOptions()
         {
             StyleBundles = new BundleConfigurationCollection();
             ScriptBundles = new BundleConfigurationCollection();
             MinificationIgnoredFiles = new HashSet<string>();
+            DeferScriptsByDefault = false;
+            DeferScripts = new List<string>();
+            PreloadStylesByDefault = false;
+            PreloadStyles = new List<string>();
         }
     }
-}
+}

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

@@ -28,6 +28,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
             {
                 await ResourceService.ProcessAsync(
                     TagHelper.ViewContext,
+                    TagHelper,
                     context,
                     output,
                     new List<BundleTagHelperItem>

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

@@ -20,6 +20,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
         {
             await ResourceService.ProcessAsync(
                 TagHelper.ViewContext,
+                TagHelper,
                 context,
                 output,
                 await GetBundleItems(context, output),

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

@@ -5,10 +5,13 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
     [HtmlTargetElement("abp-script-bundle", TagStructure = TagStructure.NormalOrSelfClosing)]
     public class AbpScriptBundleTagHelper : AbpBundleTagHelper<AbpScriptBundleTagHelper, AbpScriptBundleTagHelperService>, IBundleTagHelper
     {
+        [HtmlAttributeName("defer")]
+        public bool Defer { get; set; }
+
         public AbpScriptBundleTagHelper(AbpScriptBundleTagHelperService service)
             : base(service)
         {
 
         }
     }
-}
+}

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

@@ -5,6 +5,9 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
     [HtmlTargetElement("abp-script", TagStructure = TagStructure.NormalOrSelfClosing)]
     public class AbpScriptTagHelper : AbpBundleItemTagHelper<AbpScriptTagHelper, AbpScriptTagHelperService>, IBundleItemTagHelper
     {
+        [HtmlAttributeName("defer")]
+        public bool Defer { get; set; }
+
         public AbpScriptTagHelper(AbpScriptTagHelperService service)
             : base(service)
         {
@@ -16,4 +19,4 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
             return "js";
         }
     }
-}
+}

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

@@ -5,6 +5,9 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
     [HtmlTargetElement("abp-style-bundle", TagStructure = TagStructure.NormalOrSelfClosing)]
     public class AbpStyleBundleTagHelper : AbpBundleTagHelper<AbpStyleBundleTagHelper, AbpStyleBundleTagHelperService>, IBundleTagHelper
     {
+        [HtmlAttributeName("preload")]
+        public bool Preload { get; set; }
+
         public AbpStyleBundleTagHelper(AbpStyleBundleTagHelperService service)
             : base(service)
         {

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

@@ -5,6 +5,9 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
     [HtmlTargetElement("abp-style", TagStructure = TagStructure.NormalOrSelfClosing)]
     public class AbpStyleTagHelper : AbpBundleItemTagHelper<AbpStyleTagHelper, AbpStyleTagHelperService>, IBundleItemTagHelper
     {
+        [HtmlAttributeName("preload")]
+        public bool Preload { get; set; }
+
         public AbpStyleTagHelper(AbpStyleTagHelperService service)
             : base(service)
         {
@@ -16,4 +19,4 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
             return "css";
         }
     }
-}
+}

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

@@ -36,6 +36,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
 
         public virtual async Task ProcessAsync(
             [NotNull] ViewContext viewContext,
+            [NotNull] TagHelper tagHelper,
             [NotNull] TagHelperContext context,
             [NotNull] TagHelperOutput output,
             [NotNull] List<BundleTagHelperItem> bundleItems,
@@ -72,7 +73,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
 
                 if (file.Length > 0)
                 {
-                    AddHtmlTag(viewContext, context, output, bundleFile + "?_v=" + file.LastModified.UtcTicks);
+                    AddHtmlTag(viewContext, tagHelper, context, output, bundleFile + "?_v=" + file.LastModified.UtcTicks);
                 }
             }
 
@@ -84,7 +85,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
 
         protected abstract Task<IReadOnlyList<string>> GetBundleFilesAsync(string bundleName);
 
-        protected abstract void AddHtmlTag(ViewContext viewContext, TagHelperContext context, TagHelperOutput output, string file);
+        protected abstract void AddHtmlTag(ViewContext viewContext, TagHelper tagHelper, TagHelperContext context, TagHelperOutput output, string file);
 
         protected virtual string GenerateBundleName(List<BundleTagHelperItem> bundleItems)
         {

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

@@ -4,13 +4,10 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Rendering;
-using Microsoft.AspNetCore.Mvc.Routing;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
-using Volo.Abp.AspNetCore.VirtualFileSystem;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
 {
@@ -19,8 +16,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
         public AbpTagHelperScriptService(
             IBundleManager bundleManager,
             IOptions<AbpBundlingOptions> options,
-            IWebHostEnvironment hostingEnvironment
-            ) : base(
+            IWebHostEnvironment hostingEnvironment) : base(
                 bundleManager,
                 options,
                 hostingEnvironment)
@@ -41,9 +37,19 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
             return await BundleManager.GetScriptBundleFilesAsync(bundleName);
         }
 
-        protected override void AddHtmlTag(ViewContext viewContext, TagHelperContext context, TagHelperOutput output, string file)
+        protected override void AddHtmlTag(ViewContext viewContext, TagHelper tagHelper, TagHelperContext context, TagHelperOutput output, string file)
         {
-            output.Content.AppendHtml($"<script src=\"{viewContext.GetUrlHelper().Content(file.EnsureStartsWith('~'))}\"></script>{Environment.NewLine}");
+            var defer = tagHelper switch
+            {
+                AbpScriptTagHelper scriptTagHelper => scriptTagHelper.Defer,
+                AbpScriptBundleTagHelper scriptBundleTagHelper => scriptBundleTagHelper.Defer,
+                _ => false
+            };
+
+            var deferText = (defer || Options.DeferScriptsByDefault || Options.DeferScripts.Any(x => file.StartsWith(x, StringComparison.OrdinalIgnoreCase)))
+                    ? "defer"
+                    : string.Empty;
+            output.Content.AppendHtml($"<script {deferText} src=\"{viewContext.GetUrlHelper().Content(file.EnsureStartsWith('~'))}\"></script>{Environment.NewLine}");
         }
     }
 }

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

@@ -4,13 +4,10 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Rendering;
-using Microsoft.AspNetCore.Mvc.Routing;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
-using Volo.Abp.AspNetCore.VirtualFileSystem;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
 {
@@ -19,8 +16,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
         public AbpTagHelperStyleService(
             IBundleManager bundleManager,
             IOptions<AbpBundlingOptions> options,
-            IWebHostEnvironment hostingEnvironment
-            ) : base(
+            IWebHostEnvironment hostingEnvironment) : base(
                 bundleManager,
                 options,
                 hostingEnvironment)
@@ -41,9 +37,23 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
             return await BundleManager.GetStyleBundleFilesAsync(bundleName);
         }
 
-        protected override void AddHtmlTag(ViewContext viewContext, TagHelperContext context, TagHelperOutput output, string file)
+        protected override void AddHtmlTag(ViewContext viewContext, TagHelper tagHelper, TagHelperContext context, TagHelperOutput output, string file)
         {
-            output.Content.AppendHtml($"<link rel=\"stylesheet\" href=\"{viewContext.GetUrlHelper().Content(file.EnsureStartsWith('~'))}\" />{Environment.NewLine}");
+            var preload = tagHelper switch
+            {
+                AbpStyleTagHelper styleTagHelper => styleTagHelper.Preload,
+                AbpStyleBundleTagHelper styleBundleTagHelper => styleBundleTagHelper.Preload,
+                _ => false
+            };
+
+            if (preload || Options.PreloadStylesByDefault || Options.PreloadStyles.Any(x => file.StartsWith(x, StringComparison.OrdinalIgnoreCase)))
+            {
+                output.Content.AppendHtml($"<link rel=\"preload\" href=\"{viewContext.GetUrlHelper().Content(file.EnsureStartsWith('~'))}\" as=\"style\" onload=\"this.rel='stylesheet'\" />{Environment.NewLine}");
+            }
+            else
+            {
+                output.Content.AppendHtml($"<link rel=\"stylesheet\" href=\"{viewContext.GetUrlHelper().Content(file.EnsureStartsWith('~'))}\" />{Environment.NewLine}");
+            }
         }
     }
 }