Merge branch 'v10/develop' into v10/main

Infocaster · Dec 18, 2023 · afeed64 · afeed64
2 parents 3c52552 + 59bbd19
commit afeed64
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 20 deletions.
diff --git a/src/Infocaster.Umbraco.IcomoonPicker/Assets/IcomoonManifestFilter.cs b/src/Infocaster.Umbraco.IcomoonPicker/Assets/IcomoonManifestFilter.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using Umbraco.Cms.Core.Manifest;
+
+namespace Infocaster.Umbraco.IcomoonPicker.Assets
+{
+    internal class IcomoonManifestFilter
+        : IManifestFilter
+    {
+        public void Filter(List<PackageManifest> manifests)
+        {
+            manifests.Add(new PackageManifest
+            {
+                PackageName = "Icomoon icon picker",
+                Version = Assembly.GetExecutingAssembly().GetName().Version?.ToString() ?? "1.0.0",
+                Scripts = new[]
+                {
+                    Defaults_IcomoonPicker.PluginBasePath + "/script.iife.js"
+                },
+                BundleOptions = BundleOptions.None
+            });
+        }
+    }
+}
diff --git a/src/Infocaster.Umbraco.IcomoonPicker/Assets/ScriptAsset.cs b/src/Infocaster.Umbraco.IcomoonPicker/Assets/ScriptAsset.cs
diff --git a/src/Infocaster.Umbraco.IcomoonPicker/Composers/IcomoonPickerComposer.cs b/src/Infocaster.Umbraco.IcomoonPicker/Composers/IcomoonPickerComposer.cs
@@ -1,4 +1,5 @@
-using Microsoft.Extensions.DependencyInjection;
+using Infocaster.Umbraco.IcomoonPicker.Assets;
+using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.DependencyInjection;
 
@@ -8,8 +9,8 @@ public class IcomoonPickerComposer : IComposer
     {
         public void Compose(IUmbracoBuilder builder)
         {
-            builder.BackOfficeAssets()
-                .Append<ScriptAsset>();
+            builder.ManifestFilters()
+                .Append<IcomoonManifestFilter>();
             builder.Services.AddHttpClient();
         }
     }