Skip to content

Commit 48e554e

Browse files
Convert embedded package manifest to manifest filter
1 parent 682bf7e commit 48e554e

File tree

4 files changed

+39
-24
lines changed

4 files changed

+39
-24
lines changed

src/Umbraco.Commerce.Checkout/Client/src/package.manifest

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/Umbraco.Commerce.Checkout/Umbraco.Commerce.Checkout.csproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,4 @@
3333
<ClientAssetsInputs Remove="Client\tailwind.config.js" />
3434
</ItemGroup>
3535

36-
<!-- Update package.manifest files with current build version after client assets build -->
37-
<Target Name="UpdatePackageManifestVersion" DependsOnTargets="ClientAssetsBuild" AfterTargets="GetUmbracoBuildVersion">
38-
<ItemGroup>
39-
<_PackageManifestFiles Include="$(IntermediateOutputPath)clientassets\**\package.manifest" />
40-
</ItemGroup>
41-
<JsonPathUpdateValue JsonFile="%(_PackageManifestFiles.FullPath)" Path="$.version" Value="&quot;$(PackageVersion)&quot;" />
42-
</Target>
43-
4436
</Project>
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
using System.Collections.Generic;
2+
using System.Diagnostics;
3+
using System.Reflection;
4+
using Umbraco.Cms.Core.Manifest;
5+
6+
namespace Umbraco.Commerce.Checkout
7+
{
8+
public class UmbracoCommerceCheckoutManifestFilter : IManifestFilter
9+
{
10+
public void Filter(List<PackageManifest> manifests)
11+
{
12+
var manifest = new PackageManifest()
13+
{
14+
PackageName = "Umbraco Commerce Checkout",
15+
Version = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).ProductVersion?.Split('+')[0],
16+
BundleOptions = BundleOptions.None,
17+
AllowPackageTelemetry = true,
18+
Dashboards = new ManifestDashboard[]
19+
{
20+
new ManifestDashboard
21+
{
22+
Alias = "ucc",
23+
View = "/App_Plugins/UmbracoCommerceCheckout/backoffice/views/dashboards/installer.html",
24+
Sections = new string[] { "settings" }
25+
}
26+
},
27+
Scripts = new string[]
28+
{
29+
"/App_Plugins/UmbracoCommerceCheckout/backoffice/js/uccheckout.js",
30+
}
31+
};
32+
33+
manifests.Add(manifest);
34+
}
35+
}
36+
}

src/Umbraco.Commerce.Checkout/UmbracoCommerceCheckoutUmbracoBuilderExtensions.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ public static IUmbracoBuilder AddUmbracoCommerceCheckout(this IUmbracoBuilder bu
2525
if (defaultOptions != default)
2626
options.Configure(defaultOptions);
2727

28+
if (!builder.ManifestFilters().Has<UmbracoCommerceCheckoutManifestFilter>())
29+
builder.ManifestFilters().Append<UmbracoCommerceCheckoutManifestFilter>();
30+
2831
options.ValidateDataAnnotations();
2932

3033
// Register event handlers

0 commit comments

Comments
 (0)