Add StaticAssets project

PerplexDigital · Sep 27, 2023 · 47342b3 · 47342b3
1 parent 718a7a4
commit 47342b3
Show file tree

Hide file tree

Showing 55 changed files with 89 additions and 176 deletions.
diff --git a/src/Perplex.ContentBlocks/icon.png → pkg/icon.png b/src/Perplex.ContentBlocks/icon.png → pkg/icon.png
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -22,4 +22,11 @@
     <NoWarn>$(NoWarn);CS1591</NoWarn>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)..\pkg\icon.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/src/Perplex.ContentBlocks.Core/Perplex.ContentBlocks.Core.csproj b/src/Perplex.ContentBlocks.Core/Perplex.ContentBlocks.Core.csproj
@@ -17,11 +17,4 @@
     <PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="10.0.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="..\Perplex.ContentBlocks\icon.png">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-    </None>
-  </ItemGroup>
-
 </Project>
diff --git a/src/Perplex.ContentBlocks.Core/PropertyEditor/ContentBlocksManifestFilter.cs b/src/Perplex.ContentBlocks.Core/PropertyEditor/ContentBlocksManifestFilter.cs
diff --git a/src/Perplex.ContentBlocks.StaticAssets/ManifestFilter.cs b/src/Perplex.ContentBlocks.StaticAssets/ManifestFilter.cs
@@ -0,0 +1,50 @@
+using System.Diagnostics;
+using Umbraco.Cms.Core.Manifest;
+
+namespace Perplex.ContentBlocks.StaticAssets;
+
+internal class ManifestFilter : IManifestFilter
+{
+    void IManifestFilter.Filter(List<PackageManifest> manifests)
+    {
+        var assembly = typeof(PackageManifest).Assembly;
+        var versionInfo = FileVersionInfo.GetVersionInfo(assembly.Location);
+
+        manifests.Add(new PackageManifest
+        {
+            PackageName = "Perplex.ContentBlocks",
+            Version = versionInfo.ProductVersion ?? "1.0.0",
+            AllowPackageTelemetry = false,
+            BundleOptions = BundleOptions.Default,
+            Scripts = new[]
+            {
+                // Note: .requires.js should be loaded first
+                "/App_Plugins/Perplex.ContentBlocks/perplex.content-blocks.requires.js",
+
+                "/App_Plugins/Perplex.ContentBlocks/perplex.content-blocks.api.js",
+                "/App_Plugins/Perplex.ContentBlocks/perplex.content-blocks.controller.js",
+                "/App_Plugins/Perplex.ContentBlocks/components/perplex.content-block.component.js",
+                "/App_Plugins/Perplex.ContentBlocks/components/perplex.content-blocks.add-block.js",
+                "/App_Plugins/Perplex.ContentBlocks/components/perplex.content-blocks.custom-component.js",
+                "/App_Plugins/Perplex.ContentBlocks/components/perplex.content-blocks.custom-components.js",
+                "/App_Plugins/Perplex.ContentBlocks/components/perplex.content-blocks.icon.js",
+                "/App_Plugins/Perplex.ContentBlocks/components/perplex.content-blocks.nested-content-patch.js",
+                "/App_Plugins/Perplex.ContentBlocks/configuration/perplex.content-blocks.configuration.structure.js",
+                "/App_Plugins/Perplex.ContentBlocks/lib/angular-slick.js",
+                "/App_Plugins/Perplex.ContentBlocks/lib/slick.min.js",
+                "/App_Plugins/Perplex.ContentBlocks/utils/perplex.content-blocks.copy-paste-service.js",
+                "/App_Plugins/Perplex.ContentBlocks/utils/perplex.content-blocks.utils.js",
+                "/App_Plugins/Perplex.ContentBlocks/utils/portal/perplex.content-blocks-portal.js",
+                "/App_Plugins/Perplex.ContentBlocks/utils/property/perplex.content-blocks.property-scaffold-cache.js",
+                "/App_Plugins/Perplex.ContentBlocks/utils/property/perplex.content-blocks.property.js",
+                "/App_Plugins/Perplex.ContentBlocks/utils/tab-focus/perplex.content-blocks.tab-focus-once.directive.js",
+                "/App_Plugins/Perplex.ContentBlocks/utils/tab-focus/perplex.content-blocks.tab-focus.service.js",
+            },
+
+            Stylesheets = new[]
+            {
+                "/App_Plugins/Perplex.ContentBlocks/perplex.content-blocks.css",
+            },
+        });
+    }
+}
diff --git a/src/Perplex.ContentBlocks.StaticAssets/ManifestFilterComposer.cs b/src/Perplex.ContentBlocks.StaticAssets/ManifestFilterComposer.cs
@@ -0,0 +1,10 @@
+using Umbraco.Cms.Core.Composing;
+using Umbraco.Cms.Core.DependencyInjection;
+
+namespace Perplex.ContentBlocks.StaticAssets;
+
+public class ManifestFilterComposer : IComposer
+{
+    public void Compose(IUmbracoBuilder builder)
+        => builder.ManifestFilters().Append<ManifestFilter>();
+}
diff --git a/src/Perplex.ContentBlocks.StaticAssets/Perplex.ContentBlocks.StaticAssets.csproj b/src/Perplex.ContentBlocks.StaticAssets/Perplex.ContentBlocks.StaticAssets.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+
+  <PropertyGroup Label="NuGet Package">
+    <PackageId>Perplex.ContentBlocks.StaticAssets</PackageId>
+    <PackageTags>umbraco</PackageTags>
+    <Description>Perplex.ContentBlocks Static Assets</Description>
+    <StaticWebAssetBasePath>/</StaticWebAssetBasePath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="10.0.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/...ns/Perplex.ContentBlocks/assets/icons.svg → ...ns/Perplex.ContentBlocks/assets/icons.svg b/...ns/Perplex.ContentBlocks/assets/icons.svg → ...ns/Perplex.ContentBlocks/assets/icons.svg
diff --git a/...ents/perplex.content-block.component.html → ...ents/perplex.content-block.component.html b/...ents/perplex.content-block.component.html → ...ents/perplex.content-block.component.html
diff --git a/...onents/perplex.content-block.component.js → ...onents/perplex.content-block.component.js b/...onents/perplex.content-block.component.js → ...onents/perplex.content-block.component.js
diff --git a/...nts/perplex.content-blocks.add-block.html → ...nts/perplex.content-blocks.add-block.html b/...nts/perplex.content-blocks.add-block.html → ...nts/perplex.content-blocks.add-block.html
diff --git a/...nents/perplex.content-blocks.add-block.js → ...nents/perplex.content-blocks.add-block.js b/...nents/perplex.content-blocks.add-block.js → ...nents/perplex.content-blocks.add-block.js
diff --git a/...erplex.content-blocks.custom-component.js → ...erplex.content-blocks.custom-component.js b/...erplex.content-blocks.custom-component.js → ...erplex.content-blocks.custom-component.js
diff --git a/...rplex.content-blocks.custom-components.js → ...rplex.content-blocks.custom-components.js b/...rplex.content-blocks.custom-components.js → ...rplex.content-blocks.custom-components.js
diff --git a/...components/perplex.content-blocks.icon.js → ...components/perplex.content-blocks.icon.js b/...components/perplex.content-blocks.icon.js → ...components/perplex.content-blocks.icon.js
diff --git a/...ex.content-blocks.nested-content-patch.js → ...ex.content-blocks.nested-content-patch.js b/...ex.content-blocks.nested-content-patch.js → ...ex.content-blocks.nested-content-patch.js
diff --git a/...ntent-blocks.configuration.structure.html → ...ntent-blocks.configuration.structure.html b/...ntent-blocks.configuration.structure.html → ...ntent-blocks.configuration.structure.html
diff --git a/...content-blocks.configuration.structure.js → ...content-blocks.configuration.structure.js b/...content-blocks.configuration.structure.js → ...content-blocks.configuration.structure.js
diff --git a/...gins/Perplex.ContentBlocks/lang/da-DK.xml → ...gins/Perplex.ContentBlocks/lang/da-DK.xml b/...gins/Perplex.ContentBlocks/lang/da-DK.xml → ...gins/Perplex.ContentBlocks/lang/da-DK.xml
diff --git a/...gins/Perplex.ContentBlocks/lang/en-US.xml → ...gins/Perplex.ContentBlocks/lang/en-US.xml b/...gins/Perplex.ContentBlocks/lang/en-US.xml → ...gins/Perplex.ContentBlocks/lang/en-US.xml
diff --git a/...gins/Perplex.ContentBlocks/lang/nl-NL.xml → ...gins/Perplex.ContentBlocks/lang/nl-NL.xml b/...gins/Perplex.ContentBlocks/lang/nl-NL.xml → ...gins/Perplex.ContentBlocks/lang/nl-NL.xml
diff --git a/...erplex.ContentBlocks/lib/angular-slick.js → ...erplex.ContentBlocks/lib/angular-slick.js b/...erplex.ContentBlocks/lib/angular-slick.js → ...erplex.ContentBlocks/lib/angular-slick.js
diff --git a/...ns/Perplex.ContentBlocks/lib/slick.min.js → ...ns/Perplex.ContentBlocks/lib/slick.min.js b/...ns/Perplex.ContentBlocks/lib/slick.min.js → ...ns/Perplex.ContentBlocks/lib/slick.min.js
diff --git a/...ntentBlocks/perplex.content-blocks.api.js → ...ntentBlocks/perplex.content-blocks.api.js b/...ntentBlocks/perplex.content-blocks.api.js → ...ntentBlocks/perplex.content-blocks.api.js
diff --git a/...ocks/perplex.content-blocks.controller.js → ...ocks/perplex.content-blocks.controller.js b/...ocks/perplex.content-blocks.controller.js → ...ocks/perplex.content-blocks.controller.js
diff --git a/...ContentBlocks/perplex.content-blocks.html → ...ContentBlocks/perplex.content-blocks.html b/...ContentBlocks/perplex.content-blocks.html → ...ContentBlocks/perplex.content-blocks.html
diff --git a/...ContentBlocks/perplex.content-blocks.less → ...ContentBlocks/perplex.content-blocks.less b/...ContentBlocks/perplex.content-blocks.less → ...ContentBlocks/perplex.content-blocks.less
diff --git a/...Blocks/perplex.content-blocks.requires.js → ...Blocks/perplex.content-blocks.requires.js b/...Blocks/perplex.content-blocks.requires.js → ...Blocks/perplex.content-blocks.requires.js
diff --git a/.../styles/perplex.content-blocks-block.less → .../styles/perplex.content-blocks-block.less b/.../styles/perplex.content-blocks-block.less → .../styles/perplex.content-blocks-block.less
diff --git a/...styles/perplex.content-blocks-editor.less → ...styles/perplex.content-blocks-editor.less b/...styles/perplex.content-blocks-editor.less → ...styles/perplex.content-blocks-editor.less
diff --git a/...s/styles/perplex.content-blocks-grid.less → ...s/styles/perplex.content-blocks-grid.less b/...s/styles/perplex.content-blocks-grid.less → ...s/styles/perplex.content-blocks-grid.less
diff --git a/...s/styles/perplex.content-blocks-icon.less → ...s/styles/perplex.content-blocks-icon.less b/...s/styles/perplex.content-blocks-icon.less → ...s/styles/perplex.content-blocks-icon.less
diff --git a/.../styles/perplex.content-blocks-icons.less → .../styles/perplex.content-blocks-icons.less b/.../styles/perplex.content-blocks-icons.less → .../styles/perplex.content-blocks-icons.less
diff --git a/...tyles/perplex.content-blocks-overlay.less → ...tyles/perplex.content-blocks-overlay.less b/...tyles/perplex.content-blocks-overlay.less → ...tyles/perplex.content-blocks-overlay.less
diff --git a/...styles/perplex.content-blocks-picker.less → ...styles/perplex.content-blocks-picker.less b/...styles/perplex.content-blocks-picker.less → ...styles/perplex.content-blocks-picker.less
diff --git a/...tyles/perplex.content-blocks-sidebar.less → ...tyles/perplex.content-blocks-sidebar.less b/...tyles/perplex.content-blocks-sidebar.less → ...tyles/perplex.content-blocks-sidebar.less
diff --git a/.../perplex.content-blocks-slicksliders.less → .../perplex.content-blocks-slicksliders.less b/.../perplex.content-blocks-slicksliders.less → .../perplex.content-blocks-slicksliders.less
diff --git a/...plex.content-blocks.copy-paste-service.js → ...plex.content-blocks.copy-paste-service.js b/...plex.content-blocks.copy-paste-service.js → ...plex.content-blocks.copy-paste-service.js
diff --git a/...cks/utils/perplex.content-blocks.utils.js → ...cks/utils/perplex.content-blocks.utils.js b/...cks/utils/perplex.content-blocks.utils.js → ...cks/utils/perplex.content-blocks.utils.js
diff --git a/...s/portal/perplex.content-blocks-portal.js → ...s/portal/perplex.content-blocks-portal.js b/...s/portal/perplex.content-blocks-portal.js → ...s/portal/perplex.content-blocks-portal.js
diff --git a/...content-blocks.property-scaffold-cache.js → ...content-blocks.property-scaffold-cache.js b/...content-blocks.property-scaffold-cache.js → ...content-blocks.property-scaffold-cache.js
diff --git a/...erty/perplex.content-blocks.property.html → ...erty/perplex.content-blocks.property.html b/...erty/perplex.content-blocks.property.html → ...erty/perplex.content-blocks.property.html
diff --git a/...operty/perplex.content-blocks.property.js → ...operty/perplex.content-blocks.property.js b/...operty/perplex.content-blocks.property.js → ...operty/perplex.content-blocks.property.js
diff --git a/...ontent-blocks.tab-focus-once.directive.js → ...ontent-blocks.tab-focus-once.directive.js b/...ontent-blocks.tab-focus-once.directive.js → ...ontent-blocks.tab-focus-once.directive.js
diff --git a/...rplex.content-blocks.tab-focus.service.js → ...rplex.content-blocks.tab-focus.service.js b/...rplex.content-blocks.tab-focus.service.js → ...rplex.content-blocks.tab-focus.service.js
diff --git a/src/Perplex.ContentBlocks.sln b/src/Perplex.ContentBlocks.sln
@@ -5,7 +5,9 @@ VisualStudioVersion = 17.7.34003.232
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Perplex.ContentBlocks", "Perplex.ContentBlocks\Perplex.ContentBlocks.csproj", "{CC00D01F-A987-4E6F-9983-FFAC97CE27A3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perplex.ContentBlocks.Core", "Perplex.ContentBlocks.Core\Perplex.ContentBlocks.Core.csproj", "{1282FAD9-5B28-4DBA-BF0E-0F8982085F59}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Perplex.ContentBlocks.Core", "Perplex.ContentBlocks.Core\Perplex.ContentBlocks.Core.csproj", "{1282FAD9-5B28-4DBA-BF0E-0F8982085F59}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Perplex.ContentBlocks.StaticAssets", "Perplex.ContentBlocks.StaticAssets\Perplex.ContentBlocks.StaticAssets.csproj", "{B8986C6A-0F31-4963-A439-441844FD262A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,6 +23,10 @@ Global
 		{1282FAD9-5B28-4DBA-BF0E-0F8982085F59}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1282FAD9-5B28-4DBA-BF0E-0F8982085F59}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1282FAD9-5B28-4DBA-BF0E-0F8982085F59}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B8986C6A-0F31-4963-A439-441844FD262A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8986C6A-0F31-4963-A439-441844FD262A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8986C6A-0F31-4963-A439-441844FD262A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B8986C6A-0F31-4963-A439-441844FD262A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/Perplex.ContentBlocks/App_Plugins/Perplex.ContentBlocks/components/package.manifest b/src/Perplex.ContentBlocks/App_Plugins/Perplex.ContentBlocks/components/package.manifest
diff --git a/src/Perplex.ContentBlocks/App_Plugins/Perplex.ContentBlocks/configuration/package.manifest b/src/Perplex.ContentBlocks/App_Plugins/Perplex.ContentBlocks/configuration/package.manifest
diff --git a/src/Perplex.ContentBlocks/App_Plugins/Perplex.ContentBlocks/lib/package.manifest b/src/Perplex.ContentBlocks/App_Plugins/Perplex.ContentBlocks/lib/package.manifest
diff --git a/src/Perplex.ContentBlocks/App_Plugins/Perplex.ContentBlocks/package.manifest b/src/Perplex.ContentBlocks/App_Plugins/Perplex.ContentBlocks/package.manifest
diff --git a/src/Perplex.ContentBlocks/App_Plugins/Perplex.ContentBlocks/utils/package.manifest b/src/Perplex.ContentBlocks/App_Plugins/Perplex.ContentBlocks/utils/package.manifest
diff --git a/src/Perplex.ContentBlocks/App_Plugins/Perplex.ContentBlocks/utils/portal/package.manifest b/src/Perplex.ContentBlocks/App_Plugins/Perplex.ContentBlocks/utils/portal/package.manifest
diff --git a/src/Perplex.ContentBlocks/App_Plugins/Perplex.ContentBlocks/utils/property/package.manifest b/src/Perplex.ContentBlocks/App_Plugins/Perplex.ContentBlocks/utils/property/package.manifest
diff --git a/src/Perplex.ContentBlocks/App_Plugins/Perplex.ContentBlocks/utils/tab-focus/package.manifest b/src/Perplex.ContentBlocks/App_Plugins/Perplex.ContentBlocks/utils/tab-focus/package.manifest
diff --git a/src/Perplex.ContentBlocks/Perplex.ContentBlocks.csproj b/src/Perplex.ContentBlocks/Perplex.ContentBlocks.csproj
@@ -7,15 +7,9 @@
     <IncludeBuildOutput>false</IncludeBuildOutput>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="icon.png">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-    </None>
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Perplex.ContentBlocks.Core\Perplex.ContentBlocks.Core.csproj" />
+    <ProjectReference Include="..\Perplex.ContentBlocks.StaticAssets\Perplex.ContentBlocks.StaticAssets.csproj" />
   </ItemGroup>
 
 </Project>