Skip to content

Commit 696d42f

Browse files
author
Rick Butterfield
committed
WIP for v14
1 parent 0315984 commit 696d42f

File tree

43 files changed

+788
-760
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+788
-760
lines changed

‎src/Umbraco.Community.Sustainability.TestSite.14.x/Umbraco.Community.Sustainability.TestSite.14.x.csproj

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,9 @@
55
<Nullable>enable</Nullable>
66
<RootNamespace>Umbraco.Community.Sustainability.TestSite._14.x</RootNamespace>
77
</PropertyGroup>
8+
89
<ItemGroup>
9-
<Content Include="App_Plugins\Umbraco.Community.Sustainability\js\resource-checker.js">
10-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
11-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
12-
</Content>
13-
<Content Include="App_Plugins\Umbraco.Community.Sustainability\js\sustainability-content-app.controller.js">
14-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
15-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
16-
</Content>
17-
<Content Include="App_Plugins\Umbraco.Community.Sustainability\js\sustainability.resource.js">
18-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
19-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
20-
</Content>
21-
<Content Include="App_Plugins\Umbraco.Community.Sustainability\lang\en.xml">
22-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
23-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
24-
</Content>
25-
<Content Include="App_Plugins\Umbraco.Community.Sustainability\package.manifest">
26-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
27-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
28-
</Content>
29-
<Content Include="App_Plugins\Umbraco.Community.Sustainability\views\sustainability-content-app.html">
30-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
31-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
32-
</Content>
33-
</ItemGroup>
34-
35-
<ItemGroup>
36-
<PackageReference Include="Umbraco.Cms" Version="14.0.0-rc1" />
10+
<PackageReference Include="Umbraco.Cms" Version="14.0.0-rc2" />
3711
</ItemGroup>
3812

3913
<ItemGroup>
@@ -54,10 +28,7 @@
5428
</PropertyGroup>
5529

5630
<ItemGroup>
57-
<ProjectReference Include="..\Umbraco.Community.Sustainability\Umbraco.Community.Sustainability.csproj">
58-
<ReferenceSourceTarget></ReferenceSourceTarget>
59-
<GlobalPropertiesToRemove></GlobalPropertiesToRemove>
60-
</ProjectReference>
31+
<ProjectReference Include="..\Umbraco.Community.Sustainability\Umbraco.Community.Sustainability.csproj" />
6132
</ItemGroup>
6233

6334
</Project>

‎src/Umbraco.Community.Sustainability.TestSite.14.x/appsettings-schema.Umbraco.Cms.json

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,6 @@
8484
"RichTextEditor": {
8585
"$ref": "#/definitions/RichTextEditorSettings"
8686
},
87-
"RuntimeMinification": {
88-
"$ref": "#/definitions/RuntimeMinificationSettings"
89-
},
9087
"BasicAuth": {
9188
"$ref": "#/definitions/BasicAuthSettings"
9289
},
@@ -1661,46 +1658,6 @@
16611658
"All"
16621659
]
16631660
},
1664-
"RuntimeMinificationSettings": {
1665-
"type": "object",
1666-
"properties": {
1667-
"UseInMemoryCache": {
1668-
"type": "boolean",
1669-
"description": "Use in memory cache\n ",
1670-
"default": false
1671-
},
1672-
"CacheBuster": {
1673-
"description": "The cache buster type to use\n ",
1674-
"default": "Version",
1675-
"oneOf": [
1676-
{
1677-
"$ref": "#/definitions/RuntimeMinificationCacheBuster"
1678-
}
1679-
]
1680-
},
1681-
"Version": {
1682-
"type": [
1683-
"null",
1684-
"string"
1685-
],
1686-
"description": "The unique version string used if CacheBuster is 'Version'.\n "
1687-
}
1688-
}
1689-
},
1690-
"RuntimeMinificationCacheBuster": {
1691-
"type": "string",
1692-
"description": "",
1693-
"x-enumNames": [
1694-
"Version",
1695-
"AppDomain",
1696-
"Timestamp"
1697-
],
1698-
"enum": [
1699-
"Version",
1700-
"AppDomain",
1701-
"Timestamp"
1702-
]
1703-
},
17041661
"BasicAuthSettings": {
17051662
"type": "object",
17061663
"description": "Typed configuration options for basic authentication settings.",

‎src/Umbraco.Community.Sustainability.TestSite.14.x/umbraco-package-schema.json

Lines changed: 129 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,44 @@
119119
],
120120
"type": "object"
121121
},
122+
"ManifestAppEntryPoint": {
123+
"description": "Manifest for an `appEntryPoint`, which is loaded up front when the app starts.\n\nThis type of extension gives full control and will simply load the specified JS file.\nYou could have custom logic to decide which extensions to load/register by using extensionRegistry.\nThis is useful for extensions that need to be loaded up front, like an `authProvider`.",
124+
"properties": {
125+
"alias": {
126+
"description": "The alias of the extension, ensure it is unique",
127+
"type": "string"
128+
},
129+
"js": {
130+
"description": "The file location of the javascript file to load",
131+
"type": "string"
132+
},
133+
"kind": {
134+
"description": "The kind of the extension, used to group extensions together",
135+
"examples": [
136+
"button"
137+
]
138+
},
139+
"name": {
140+
"description": "The friendly name of the extension",
141+
"type": "string"
142+
},
143+
"type": {
144+
"const": "appEntryPoint",
145+
"description": "The type of extension such as dashboard etc...",
146+
"type": "string"
147+
},
148+
"weight": {
149+
"description": "Extensions such as dashboards are ordered by weight with lower numbers being first in the list",
150+
"type": "number"
151+
}
152+
},
153+
"required": [
154+
"alias",
155+
"name",
156+
"type"
157+
],
158+
"type": "object"
159+
},
122160
"ManifestAuthProvider": {
123161
"description": "Represents an authentication provider that can be used to authenticate users.\nThe provider needs to be registered in the API that the authorization request is sent to in order to be used.",
124162
"properties": {
@@ -175,6 +213,44 @@
175213
],
176214
"type": "object"
177215
},
216+
"ManifestBackofficeEntryPoint": {
217+
"description": "Manifest for an `backofficeEntryPoint`, which is loaded after the Backoffice has been loaded and authentication has been done.\n\nThis type of extension gives full control and will simply load the specified JS file.\nYou could have custom logic to decide which extensions to load/register by using extensionRegistry.",
218+
"properties": {
219+
"alias": {
220+
"description": "The alias of the extension, ensure it is unique",
221+
"type": "string"
222+
},
223+
"js": {
224+
"description": "The file location of the javascript file to load",
225+
"type": "string"
226+
},
227+
"kind": {
228+
"description": "The kind of the extension, used to group extensions together",
229+
"examples": [
230+
"button"
231+
]
232+
},
233+
"name": {
234+
"description": "The friendly name of the extension",
235+
"type": "string"
236+
},
237+
"type": {
238+
"const": "backofficeEntryPoint",
239+
"description": "The type of extension such as dashboard etc...",
240+
"type": "string"
241+
},
242+
"weight": {
243+
"description": "Extensions such as dashboards are ordered by weight with lower numbers being first in the list",
244+
"type": "number"
245+
}
246+
},
247+
"required": [
248+
"alias",
249+
"name",
250+
"type"
251+
],
252+
"type": "object"
253+
},
178254
"ManifestBase": {
179255
"properties": {
180256
"alias": {
@@ -2150,7 +2226,7 @@
21502226
"type": "object"
21512227
},
21522228
"ManifestEntryPoint": {
2153-
"description": "This type of extension gives full control and will simply load the specified JS file\nYou could have custom logic to decide which extensions to load/register by using extensionRegistry",
2229+
"description": "Manifest for an `entryPoint`, which is loaded after the Backoffice has been loaded and authentication has been done.\n\nThis type of extension gives full control and will simply load the specified JS file.\nYou could have custom logic to decide which extensions to load/register by using extensionRegistry.",
21542230
"properties": {
21552231
"alias": {
21562232
"description": "The alias of the extension, ensure it is unique",
@@ -2468,6 +2544,43 @@
24682544
],
24692545
"type": "object"
24702546
},
2547+
"ManifestIcons": {
2548+
"properties": {
2549+
"alias": {
2550+
"description": "The alias of the extension, ensure it is unique",
2551+
"type": "string"
2552+
},
2553+
"js": {
2554+
"description": "The file location of the javascript file to load",
2555+
"type": "string"
2556+
},
2557+
"kind": {
2558+
"description": "The kind of the extension, used to group extensions together",
2559+
"examples": [
2560+
"button"
2561+
]
2562+
},
2563+
"name": {
2564+
"description": "The friendly name of the extension",
2565+
"type": "string"
2566+
},
2567+
"type": {
2568+
"const": "icons",
2569+
"description": "The type of extension such as dashboard etc...",
2570+
"type": "string"
2571+
},
2572+
"weight": {
2573+
"description": "Extensions such as dashboards are ordered by weight with lower numbers being first in the list",
2574+
"type": "number"
2575+
}
2576+
},
2577+
"required": [
2578+
"alias",
2579+
"name",
2580+
"type"
2581+
],
2582+
"type": "object"
2583+
},
24712584
"ManifestItemStore": {
24722585
"properties": {
24732586
"alias": {
@@ -3721,9 +3834,6 @@
37213834
{
37223835
"$ref": "#/definitions/ManifestCondition"
37233836
},
3724-
{
3725-
"$ref": "#/definitions/ManifestEntryPoint"
3726-
},
37273837
{
37283838
"$ref": "#/definitions/ManifestSectionSidebarAppMenuKind"
37293839
},
@@ -3740,13 +3850,13 @@
37403850
"$ref": "#/definitions/ManifestTree"
37413851
},
37423852
{
3743-
"$ref": "#/definitions/ManifestDashboard"
3853+
"$ref": "#/definitions/ManifestAppEntryPoint"
37443854
},
37453855
{
3746-
"$ref": "#/definitions/ManifestExternalLoginProvider"
3856+
"$ref": "#/definitions/ManifestBackofficeEntryPoint"
37473857
},
37483858
{
3749-
"$ref": "#/definitions/ManifestMenuItem"
3859+
"$ref": "#/definitions/ManifestEntryPoint"
37503860
},
37513861
{
37523862
"$ref": "#/definitions/ManifestAuthProvider"
@@ -3772,6 +3882,9 @@
37723882
{
37733883
"$ref": "#/definitions/ManifestCurrentUserActionDefaultKind<MetaCurrentUserActionDefaultKind>"
37743884
},
3885+
{
3886+
"$ref": "#/definitions/ManifestDashboard"
3887+
},
37753888
{
37763889
"$ref": "#/definitions/ManifestDashboardCollection"
37773890
},
@@ -3826,6 +3939,9 @@
38263939
{
38273940
"$ref": "#/definitions/ManifestEntityBulkAction<MetaEntityBulkAction>"
38283941
},
3942+
{
3943+
"$ref": "#/definitions/ManifestExternalLoginProvider"
3944+
},
38293945
{
38303946
"$ref": "#/definitions/ManifestGlobalContext"
38313947
},
@@ -3838,12 +3954,18 @@
38383954
{
38393955
"$ref": "#/definitions/ManifestHealthCheck"
38403956
},
3957+
{
3958+
"$ref": "#/definitions/ManifestIcons"
3959+
},
38413960
{
38423961
"$ref": "#/definitions/ManifestItemStore"
38433962
},
38443963
{
38453964
"$ref": "#/definitions/ManifestMenu"
38463965
},
3966+
{
3967+
"$ref": "#/definitions/ManifestMenuItem"
3968+
},
38473969
{
38483970
"$ref": "#/definitions/ManifestMenuItemTreeKind"
38493971
},

0 commit comments

Comments
 (0)