Skip to content

Commit 8e08afb

Browse files
committed
refactor: replace umbraco-package.json with PackageManifestReader
1 parent a571066 commit 8e08afb

File tree

9 files changed

+61
-52
lines changed

9 files changed

+61
-52
lines changed

src/TestSite/Views/Shared/_Layout.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<div class="container py-4">
3737
<div class="row">
3838
<div class="col">
39-
<a href="https://github.com/jcdcdev/jcdcdev.Umbraco.Core" target="_blank">jcdcdev.Umbraco.Core</a>
39+
<a href="https://github.com/jcdcdev/jcdcdev.Umbraco.ReadingTime" target="_blank">jcdcdev.Umbraco.ReadingTime</a>
4040
</div>
4141
</div>
4242
</div>
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
import { defineConfig } from "vite";
1+
import {defineConfig} from "vite";
22

33
export default defineConfig({
4-
build: {
5-
lib: {
6-
entry: "src/index.ts",
7-
formats: ["es"],
4+
build: {
5+
lib: {
6+
entry: ["src/index.ts"],
7+
formats: ["es"],
8+
},
9+
outDir: "../jcdcdev.Umbraco.ReadingTime/wwwroot/App_Plugins/jcdcdev.Umbraco.ReadingTime/dist/",
10+
sourcemap: true,
11+
rollupOptions: {
12+
external: [/^@umbraco/],
13+
},
814
},
9-
outDir: "../jcdcdev.Umbraco.ReadingTime/wwwroot/App_Plugins/jcdcdev.Umbraco.ReadingTime/dist/",
10-
sourcemap: true,
11-
rollupOptions: {
12-
external: [/^@umbraco/],
13-
},
14-
},
1515
});
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
using jcdcdev.Umbraco.Core.Extensions;
2+
using jcdcdev.Umbraco.Core.Web.Models.Manifests;
3+
using Umbraco.Cms.Core.Manifest;
4+
using Umbraco.Cms.Infrastructure.Manifest;
5+
6+
namespace jcdcdev.Umbraco.ReadingTime.Core.Composing;
7+
8+
public class PackageManifestReader : IPackageManifestReader
9+
{
10+
public async Task<IEnumerable<PackageManifest>> ReadPackageManifestsAsync()
11+
{
12+
var extensions = new List<IManifest>();
13+
var packageManifest = new PackageManifest
14+
{
15+
Name = Constants.Package.Name,
16+
Version = EnvironmentExtensions.CurrentAssemblyVersion().ToSemVer()?.ToString() ?? "0.1.0",
17+
AllowPublicAccess = false,
18+
AllowTelemetry = true,
19+
Extensions = []
20+
};
21+
22+
extensions.Add(new BackofficeEntryPointManifest
23+
{
24+
Name = "reading-time.entrypoint",
25+
Alias = "reading-time.entrypoint",
26+
Js = "/App_Plugins/jcdcdev.Umbraco.ReadingTime/dist/index.js"
27+
});
28+
29+
packageManifest.Extensions = extensions.OfType<object>().ToArray();
30+
return [packageManifest];
31+
}
32+
}

src/jcdcdev.Umbraco.ReadingTime/Core/Constants.cs

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,13 @@ public static class Constants
44
{
55
public const string TableName = "jcdcdevReadingTime";
66
public const string PropertyEditorAlias = "jcdcdev.ReadingTime";
7-
public const string PropertyEditorUIAlias = "jcdcdev.ReadingTime";
7+
public const string PropertyEditorUiAlias = "jcdcdev.ReadingTime";
88

99
public static class Package
1010
{
1111
public const string Name = "jcdcdev.Umbraco.ReadingTime";
1212
}
1313

14-
public static class LocalisationKeys
15-
{
16-
public const string SaveAndPublishToGenerateReadingTime = "saveAndPublishToGenerateReadingTime";
17-
public const string Area = "readingTime";
18-
public const string WordsPerMinutesDescription = "wordsPerMinutesDescription";
19-
public const string WordsPerMinutesName = "wordsPerMinutes";
20-
public const string MinUnit = "minUnit";
21-
public const string MaxUnit = "maxUnit";
22-
public const string MinUnitDescription = "minUnitDescription";
23-
public const string MaxUnitDescription = "maxUnitDescription";
24-
public const string VariationWarning = "variationWarning";
25-
public const string HideVariationWarning = "hideVariationWarning";
26-
public const string HideVariationWarningDescription = "hideVariationWarningDescription";
27-
}
28-
2914
public static class Configuration
3015
{
3116
public const string Wpm = "wpm";

src/jcdcdev.Umbraco.ReadingTime/Core/Extensions/UmbracoBuilderExtensions.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using Microsoft.Extensions.DependencyInjection;
77
using Umbraco.Cms.Core.DependencyInjection;
88
using Umbraco.Cms.Core.Notifications;
9+
using Umbraco.Cms.Infrastructure.Manifest;
910
using Umbraco.Extensions;
1011

1112
namespace jcdcdev.Umbraco.ReadingTime.Core.Extensions;
@@ -22,6 +23,7 @@ public static IUmbracoBuilder AddReadingTime(this IUmbracoBuilder builder)
2223
builder.Services.AddSingleton<IReadingTimeRepository, ReadingTimeRepository>();
2324

2425
builder.ReadingTimeValueProviders().Append<BlockReadingTimeValueProvider>();
26+
builder.Services.AddSingleton<IPackageManifestReader, PackageManifestReader>();
2527

2628
return builder;
2729
}

src/jcdcdev.Umbraco.ReadingTime/Core/PropertyEditors/ReadingTimeDataEditor.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace jcdcdev.Umbraco.ReadingTime.Core.PropertyEditors;
1010

11-
[DataEditor(Constants.PropertyEditorUIAlias)]
11+
[DataEditor(Constants.PropertyEditorUiAlias)]
1212
public class ReadingTimeDataEditor(IDataValueEditorFactory dataValueEditorFactory, IIOHelper ioHelper, ILogger<ReadingTimeDataEditor> logger)
1313
: DataEditor(dataValueEditorFactory)
1414
{
@@ -43,10 +43,10 @@ private string GetName(TimeUnit timeUnit)
4343
return timeUnit.Humanize();
4444
}
4545
}
46-
}
4746

48-
public class DropDownPreValue(string label, int value)
49-
{
50-
[JsonProperty("label")] public string Label = label;
51-
[JsonProperty("value")] public int Value = value;
47+
internal class DropDownPreValue(string label, int value)
48+
{
49+
[JsonProperty("label")] public string Label = label;
50+
[JsonProperty("value")] public int Value = value;
51+
}
5252
}

src/jcdcdev.Umbraco.ReadingTime/Web/Controllers/ReadingTimeController.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using jcdcdev.Umbraco.ReadingTime.Core.Extensions;
33
using jcdcdev.Umbraco.ReadingTime.Core.Models;
44
using jcdcdev.Umbraco.ReadingTime.Core.PropertyEditors;
5+
using jcdcdev.Umbraco.ReadingTime.Web.Models;
56
using Microsoft.AspNetCore.Authorization;
67
using Microsoft.AspNetCore.Mvc;
78
using Umbraco.Cms.Core.Services;
@@ -45,9 +46,3 @@ public async Task<IActionResult> Get(string contentKey, string dataTypeKey, stri
4546
return Ok(model);
4647
}
4748
}
48-
49-
public class ReadingTimeResponse(string readingTime, DateTime updateDate)
50-
{
51-
public DateTime UpdateDate { get; } = updateDate;
52-
public string ReadingTime { get; } = readingTime;
53-
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
namespace jcdcdev.Umbraco.ReadingTime.Web.Models;
2+
3+
public class ReadingTimeResponse(string readingTime, DateTime updateDate)
4+
{
5+
public DateTime UpdateDate { get; } = updateDate;
6+
public string ReadingTime { get; } = readingTime;
7+
}

src/jcdcdev.Umbraco.ReadingTime/wwwroot/App_Plugins/jcdcdev.Umbraco.ReadingTime/umbraco-package.json

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

0 commit comments

Comments
 (0)