diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts index e9d11875c6..b08184769a 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts @@ -37,7 +37,7 @@ import { manifests as editorManifests } from './editors/manifests'; import { manifests as propertyActionManifests } from './property-actions/manifests'; import { UmbContextConsumerMixin, UmbContextProviderMixin } from '@umbraco-cms/context-api'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; -import type { ManifestTypes, ManifestWithLoader } from '@umbraco-cms/models'; +import type { ManifestTypes } from '@umbraco-cms/models'; @defineElement('umb-backoffice') export class UmbBackofficeElement extends UmbContextConsumerMixin(UmbContextProviderMixin(LitElement)) { @@ -82,7 +82,7 @@ export class UmbBackofficeElement extends UmbContextConsumerMixin(UmbContextProv this.provideContext('umbSectionStore', new UmbSectionStore()); } - private _registerExtensions(manifests: Array> | Array) { + private _registerExtensions(manifests: Array | Array) { manifests.forEach((manifest) => { if (umbExtensionsRegistry.isRegistered(manifest.alias)) return; umbExtensionsRegistry.register(manifest); diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/editor-document-type.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/editor-document-type.element.ts index 8605464946..713e572aa6 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/editor-document-type.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/editor-document-type.element.ts @@ -8,7 +8,7 @@ import { DocumentTypeEntity } from '../../../core/mocks/data/document-type.data' import { UmbDocumentTypeContext } from './document-type.context'; import { UmbObserverMixin } from '@umbraco-cms/observable-api'; import { UmbContextConsumerMixin, UmbContextProviderMixin } from '@umbraco-cms/context-api'; -import type { ManifestTypes, ManifestWithLoader } from '@umbraco-cms/models'; +import type { ManifestTypes } from '@umbraco-cms/models'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; import '../../property-editor-uis/icon-picker/property-editor-ui-icon-picker.element'; @@ -56,7 +56,7 @@ export class UmbEditorDocumentTypeElement extends UmbContextProviderMixin( } private _registerExtensions() { - const extensions: Array> = [ + const extensions: Array = [ { type: 'editorView', alias: 'Umb.EditorView.DocumentType.Design', diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document/editor-document.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/document/editor-document.element.ts index 7b0c061cc3..d9c4fd98c2 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document/editor-document.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/document/editor-document.element.ts @@ -2,7 +2,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, LitElement } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; -import type { ManifestEditorView, ManifestWithLoader } from '@umbraco-cms/models'; +import type { ManifestEditorView } from '@umbraco-cms/models'; import '../shared/node/editor-node.element'; @@ -29,7 +29,7 @@ export class UmbEditorDocumentElement extends LitElement { } private _registerEditorViews() { - const dashboards: Array> = [ + const dashboards: Array = [ { type: 'editorView', alias: 'Umb.EditorView.Document.Edit', diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/manifests.ts index 976fc97c47..ff68424e23 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/manifests.ts @@ -1,6 +1,6 @@ -import type { ManifestEditor, ManifestWithLoader } from '@umbraco-cms/models'; +import type { ManifestEditor } from '@umbraco-cms/models'; -export const manifests: Array> = [ +export const manifests: Array = [ { type: 'editor', alias: 'Umb.Editor.Member', diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/media/editor-media.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/media/editor-media.element.ts index a103fe5c5d..380f974ecb 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/media/editor-media.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/media/editor-media.element.ts @@ -1,7 +1,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, LitElement } from 'lit'; import { customElement, property } from 'lit/decorators.js'; -import type { ManifestEditorView, ManifestWithLoader } from '@umbraco-cms/models'; +import type { ManifestEditorView } from '@umbraco-cms/models'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; import '../shared/node/editor-node.element'; @@ -29,7 +29,7 @@ export class UmbEditorMediaElement extends LitElement { } private _registerEditorViews() { - const dashboards: Array> = [ + const dashboards: Array = [ { type: 'editorView', alias: 'Umb.EditorView.Media.Edit', diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/user-group/editor-user-group.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/user-group/editor-user-group.element.ts index 4ae2c5a5ab..feaeb702f3 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/user-group/editor-user-group.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/user-group/editor-user-group.element.ts @@ -8,7 +8,7 @@ import { UmbObserverMixin } from '@umbraco-cms/observable-api'; import '@umbraco-cms/components/input-user/input-user.element'; import '@umbraco-cms/components/input-section/input-section.element'; import { UmbContextConsumerMixin, UmbContextProviderMixin } from '@umbraco-cms/context-api'; -import type { ManifestEditorAction, ManifestWithLoader, UserDetails, UserGroupDetails } from '@umbraco-cms/models'; +import type { ManifestEditorAction, UserDetails, UserGroupDetails } from '@umbraco-cms/models'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; import { UmbUserGroupStore } from '@umbraco-cms/stores/user/user-group.store'; import { UmbUserStore } from '@umbraco-cms/stores/user/user.store'; @@ -205,7 +205,7 @@ export class UmbEditorUserGroupElement extends UmbContextProviderMixin( } private _registerEditorActions() { - const manifests: Array> = [ + const manifests: Array = [ { type: 'editorAction', alias: 'Umb.EditorAction.UserGroup.Save', diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/user/editor-user.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/user/editor-user.element.ts index a4de7475d9..3518a12957 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/user/editor-user.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/user/editor-user.element.ts @@ -11,7 +11,7 @@ import { UmbUserStore } from '@umbraco-cms/stores/user/user.store'; import { UmbContextProviderMixin, UmbContextConsumerMixin } from '@umbraco-cms/context-api'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; -import type { ManifestEditorAction, ManifestWithLoader, UserDetails } from '@umbraco-cms/models'; +import type { ManifestEditorAction, UserDetails } from '@umbraco-cms/models'; import { UmbObserverMixin } from '@umbraco-cms/observable-api'; import '../../property-editor-uis/content-picker/property-editor-ui-content-picker.element'; @@ -101,7 +101,7 @@ export class UmbEditorUserElement extends UmbContextProviderMixin( } private _registerEditorActions() { - const manifests: Array> = [ + const manifests: Array = [ { type: 'editorAction', alias: 'Umb.EditorAction.User.Save', diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/property-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/property-actions/manifests.ts index 85bca873db..1b5a1b4307 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/property-actions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/property-actions/manifests.ts @@ -1,6 +1,6 @@ -import type { ManifestPropertyAction, ManifestWithLoader } from '@umbraco-cms/models'; +import type { ManifestPropertyAction } from '@umbraco-cms/models'; -export const manifests: Array> = [ +export const manifests: Array = [ { type: 'propertyAction', alias: 'Umb.PropertyAction.Copy', diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/manifests.ts index e47005af0f..9e5c5ce55b 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/manifests.ts @@ -1,6 +1,6 @@ -import type { ManifestPropertyEditorUI, ManifestWithLoader } from '@umbraco-cms/models'; +import type { ManifestPropertyEditorUI } from '@umbraco-cms/models'; -export const manifests: Array> = [ +export const manifests: Array = [ { type: 'propertyEditorUI', alias: 'Umb.PropertyEditorUI.BlockList', diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/content/content-section.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/content/content-section.element.ts index b7a4e84f90..3385824024 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/content/content-section.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/content/content-section.element.ts @@ -1,7 +1,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { html, LitElement } from 'lit'; import { customElement } from 'lit/decorators.js'; -import type { ManifestDashboard, ManifestWithLoader } from '@umbraco-cms/models'; +import type { ManifestDashboard } from '@umbraco-cms/models'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; @customElement('umb-content-section') @@ -15,7 +15,7 @@ export class UmbContentSection extends LitElement { } private _registerDashboards() { - const dashboards: Array> = [ + const dashboards: Array = [ { type: 'dashboard', alias: 'Umb.Dashboard.Welcome', diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/manifests.ts index f436705daf..5dab44e9a3 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/manifests.ts @@ -1,6 +1,6 @@ -import type { ManifestSection, ManifestWithLoader } from '@umbraco-cms/models'; +import type { ManifestSection } from '@umbraco-cms/models'; -export const manifests: Array> = [ +export const manifests: Array = [ { type: 'section', alias: 'Umb.Section.Content', diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/media/media-section.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/media/media-section.element.ts index c2bbf4b06a..8a1f4ca078 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/media/media-section.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/media/media-section.element.ts @@ -2,7 +2,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { html, LitElement } from 'lit'; import { customElement } from 'lit/decorators.js'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; -import type { ManifestDashboard, ManifestWithLoader } from '@umbraco-cms/models'; +import type { ManifestDashboard } from '@umbraco-cms/models'; @customElement('umb-media-section') export class UmbMediaSection extends LitElement { @@ -14,7 +14,7 @@ export class UmbMediaSection extends LitElement { } private _registerDashboards() { - const dashboards: Array> = [ + const dashboards: Array = [ { type: 'dashboard', alias: 'Umb.Dashboard.MediaManagement', diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/section-packages.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/section-packages.element.ts index 9bf897780f..e28fab14ef 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/section-packages.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/section-packages.element.ts @@ -2,7 +2,7 @@ import { html, LitElement } from 'lit'; import { customElement } from 'lit/decorators.js'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; -import type { ManifestSectionView, ManifestWithLoader } from '@umbraco-cms/models'; +import type { ManifestSectionView } from '@umbraco-cms/models'; @customElement('umb-section-packages') export class UmbSectionPackages extends UmbContextConsumerMixin(LitElement) { @@ -13,7 +13,7 @@ export class UmbSectionPackages extends UmbContextConsumerMixin(LitElement) { } private _registerSectionViews() { - const manifests: Array> = [ + const manifests: Array = [ { type: 'sectionView', alias: 'Umb.SectionView.Packages.Repo', diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/settings/settings-section.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/settings/settings-section.element.ts index 22c9c08c4a..e5ca3a2095 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/settings/settings-section.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/settings/settings-section.element.ts @@ -1,7 +1,7 @@ import { html, LitElement } from 'lit'; import { customElement } from 'lit/decorators.js'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; -import type { ManifestDashboard, ManifestWithLoader } from '@umbraco-cms/models'; +import type { ManifestDashboard } from '@umbraco-cms/models'; @customElement('umb-section-settings') export class UmbSectionSettingsElement extends LitElement { @@ -12,7 +12,7 @@ export class UmbSectionSettingsElement extends LitElement { } private _registerDashboards() { - const dashboards: Array> = [ + const dashboards: Array = [ { type: 'dashboard', alias: 'Umb.Dashboard.SettingsWelcome', diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/section-users.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/section-users.element.ts index 1af5395985..e77d19d21d 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/section-users.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/section-users.element.ts @@ -1,7 +1,7 @@ import { html, LitElement } from 'lit'; import { customElement } from 'lit/decorators.js'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; -import type { ManifestSectionView, ManifestWithLoader } from '@umbraco-cms/models'; +import type { ManifestSectionView } from '@umbraco-cms/models'; @customElement('umb-section-users') export class UmbSectionUsersElement extends LitElement { @@ -12,7 +12,7 @@ export class UmbSectionUsersElement extends LitElement { } private _registerSectionViews() { - const manifests: Array> = [ + const manifests: Array = [ { type: 'sectionView', alias: 'Umb.SectionView.Users.Users', diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/data-types/tree-data-types.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/data-types/tree-data-types.element.ts index 0343a46485..b3899af3af 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/data-types/tree-data-types.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/data-types/tree-data-types.element.ts @@ -5,7 +5,7 @@ import { UmbTreeBase } from '../shared/tree-base.element'; import { UmbTreeDataTypesDataContext } from './tree-data-types-data.context'; import { UmbContextConsumerMixin, UmbContextProviderMixin } from '@umbraco-cms/context-api'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; -import type { ManifestTreeItemAction, ManifestWithLoader } from '@umbraco-cms/models'; +import type { ManifestTreeItemAction } from '@umbraco-cms/models'; import '../shared/tree-navigator.element'; @@ -26,7 +26,7 @@ export class UmbTreeDataTypesElement extends UmbContextProviderMixin(UmbContextC } private _registerTreeItemActions() { - const dashboards: Array> = [ + const dashboards: Array = [ { type: 'treeItemAction', alias: 'Umb.TreeItemAction.DataType.Create', diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/documents/tree-documents.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/documents/tree-documents.element.ts index b49b201b1a..58416e00eb 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/documents/tree-documents.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/documents/tree-documents.element.ts @@ -4,7 +4,7 @@ import { UmbEntityStore } from '../../../core/stores/entity.store'; import { UmbTreeBase } from '../shared/tree-base.element'; import { UmbTreeDocumentDataContext } from './tree-documents-data.context'; import { UmbContextConsumerMixin, UmbContextProviderMixin } from '@umbraco-cms/context-api'; -import type { ManifestTreeItemAction, ManifestWithLoader } from '@umbraco-cms/models'; +import type { ManifestTreeItemAction } from '@umbraco-cms/models'; import '../shared/tree-navigator.element'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; @@ -25,7 +25,7 @@ export class UmbTreeDocumentElement extends UmbContextProviderMixin(UmbContextCo } private _registerTreeItemActions() { - const dashboards: Array> = [ + const dashboards: Array = [ { type: 'treeItemAction', alias: 'Umb.TreeItemAction.Document.Create', diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/manifests.ts index 9fbbb25f78..53879c4e61 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/manifests.ts @@ -1,6 +1,6 @@ -import type { ManifestTree, ManifestWithLoader } from '@umbraco-cms/models'; +import type { ManifestTree } from '@umbraco-cms/models'; -export const manifests: Array> = [ +export const manifests: Array = [ { type: 'tree', alias: 'Umb.Tree.Extensions', diff --git a/src/Umbraco.Web.UI.Client/src/core/extensions-registry/models.ts b/src/Umbraco.Web.UI.Client/src/core/extensions-registry/models.ts index 1131b31ab3..13939b8681 100644 --- a/src/Umbraco.Web.UI.Client/src/core/extensions-registry/models.ts +++ b/src/Umbraco.Web.UI.Client/src/core/extensions-registry/models.ts @@ -81,6 +81,7 @@ export interface ManifestElement extends ManifestBase { type: ManifestStandardTypes; js?: string; elementName?: string; + loader?: () => Promise; meta?: any; } @@ -93,6 +94,3 @@ export interface ManifestEntrypoint extends ManifestBase { type: 'entrypoint'; js: string; } - -// TODO: couldn't we make loader optional on all manifests? and not just the internal ones? -export type ManifestWithLoader = T & { loader: () => Promise };