From ebc37cedddf76244649662544e5c6d9715a9efba Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 30 Sep 2024 14:12:26 +0200 Subject: [PATCH 1/6] move files --- .../examples/ufm-custom-component/index.ts | 2 +- .../src/packages/core/extension-registry/models/index.ts | 6 ------ .../src/packages/ufm/components/manifests.ts | 2 +- .../src/packages/ufm/components/ufm-component-base.ts | 2 +- .../src/packages/ufm/contexts/ufm.context.ts | 3 ++- .../src/packages/ufm/filters/manifests.ts | 2 +- src/Umbraco.Web.UI.Client/src/packages/ufm/index.ts | 2 ++ src/Umbraco.Web.UI.Client/src/packages/ufm/types.ts | 2 +- .../ufm-component.extension.ts} | 6 ++++++ .../ufm-filter.model.ts => ufm/ufm-filter.extension.ts} | 6 ++++++ 10 files changed, 21 insertions(+), 12 deletions(-) rename src/Umbraco.Web.UI.Client/src/packages/{core/extension-registry/models/ufm-component.model.ts => ufm/ufm-component.extension.ts} (81%) rename src/Umbraco.Web.UI.Client/src/packages/{core/extension-registry/models/ufm-filter.model.ts => ufm/ufm-filter.extension.ts} (79%) diff --git a/src/Umbraco.Web.UI.Client/examples/ufm-custom-component/index.ts b/src/Umbraco.Web.UI.Client/examples/ufm-custom-component/index.ts index 2da0c936cc..af49cdc0f3 100644 --- a/src/Umbraco.Web.UI.Client/examples/ufm-custom-component/index.ts +++ b/src/Umbraco.Web.UI.Client/examples/ufm-custom-component/index.ts @@ -1,4 +1,4 @@ -import type { ManifestUfmComponent } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestUfmComponent } from '@umbraco-cms/backoffice/ufm'; export const manifests: Array = [ { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts index b37bdc0774..06257b9f62 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts @@ -1,13 +1,9 @@ import type { ManifestDynamicRootOrigin, ManifestDynamicRootQueryStep } from './dynamic-root.model.js'; import type { ManifestFileUploadPreview } from './file-upload-preview.model.js'; -import type { ManifestUfmComponent } from './ufm-component.model.js'; -import type { ManifestUfmFilter } from './ufm-filter.model.js'; import type { ManifestBase, ManifestBundle, ManifestCondition } from '@umbraco-cms/backoffice/extension-api'; export type * from './dynamic-root.model.js'; export type * from './file-upload-preview.model.js'; -export type * from './ufm-component.model.js'; -export type * from './ufm-filter.model.js'; export type ManifestTypes = | ManifestBundle @@ -15,8 +11,6 @@ export type ManifestTypes = | ManifestDynamicRootOrigin | ManifestDynamicRootQueryStep | ManifestFileUploadPreview - | ManifestUfmComponent - | ManifestUfmFilter | ManifestBase; type UnionOfProperties = T extends object ? T[keyof T] : never; diff --git a/src/Umbraco.Web.UI.Client/src/packages/ufm/components/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/ufm/components/manifests.ts index a1120024a0..99ec024f17 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/ufm/components/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/ufm/components/manifests.ts @@ -1,4 +1,4 @@ -import type { ManifestUfmComponent } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestUfmComponent } from '../ufm-component.extension.js'; export const manifests: Array = [ { diff --git a/src/Umbraco.Web.UI.Client/src/packages/ufm/components/ufm-component-base.ts b/src/Umbraco.Web.UI.Client/src/packages/ufm/components/ufm-component-base.ts index 6b1d35217d..d344e01aa8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/ufm/components/ufm-component-base.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/ufm/components/ufm-component-base.ts @@ -1,5 +1,5 @@ import type { UfmToken } from '../plugins/marked-ufm.plugin.js'; -import type { UmbUfmComponentApi } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbUfmComponentApi } from '../ufm-component.extension.js'; export abstract class UmbUfmComponentBase implements UmbUfmComponentApi { protected getAttributes(text: string): string | null { diff --git a/src/Umbraco.Web.UI.Client/src/packages/ufm/contexts/ufm.context.ts b/src/Umbraco.Web.UI.Client/src/packages/ufm/contexts/ufm.context.ts index 4a8512fc41..86563bc56d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/ufm/contexts/ufm.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/ufm/contexts/ufm.context.ts @@ -1,5 +1,7 @@ import { ufm } from '../plugins/marked-ufm.plugin.js'; import type { UfmPlugin } from '../plugins/marked-ufm.plugin.js'; +import type { ManifestUfmComponent } from '../ufm-component.extension.js'; +import type { ManifestUfmFilter } from '../ufm-filter.extension.js'; import { DOMPurify } from '@umbraco-cms/backoffice/external/dompurify'; import { Marked } from '@umbraco-cms/backoffice/external/marked'; import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api'; @@ -7,7 +9,6 @@ import { UmbContextBase } from '@umbraco-cms/backoffice/class-api'; import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; import { UmbExtensionsApiInitializer } from '@umbraco-cms/backoffice/extension-api'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; -import type { ManifestUfmFilter, ManifestUfmComponent } from '@umbraco-cms/backoffice/extension-registry'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { UmbExtensionApiInitializer } from '@umbraco-cms/backoffice/extension-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/ufm/filters/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/ufm/filters/manifests.ts index c80c5ffd35..1e08fa9f26 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/ufm/filters/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/ufm/filters/manifests.ts @@ -1,4 +1,4 @@ -import type { ManifestUfmFilter } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestUfmFilter } from '../ufm-filter.extension.js'; export const manifests: Array = [ { diff --git a/src/Umbraco.Web.UI.Client/src/packages/ufm/index.ts b/src/Umbraco.Web.UI.Client/src/packages/ufm/index.ts index 56ba93470c..481d5818a8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/ufm/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/ufm/index.ts @@ -2,3 +2,5 @@ export * from './types.js'; export * from './components/index.js'; export * from './contexts/index.js'; export * from './plugins/index.js'; +export * from './ufm-component.extension.js'; +export * from './ufm-filter.extension.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/ufm/types.ts b/src/Umbraco.Web.UI.Client/src/packages/ufm/types.ts index 94c6966cc1..066099c1db 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/ufm/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/ufm/types.ts @@ -1,4 +1,4 @@ -import type { UmbUfmFilterApi } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbUfmFilterApi } from './ufm-filter.extension.js'; export abstract class UmbUfmFilterBase implements UmbUfmFilterApi { abstract filter(...args: Array): string | undefined | null; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/ufm-component.model.ts b/src/Umbraco.Web.UI.Client/src/packages/ufm/ufm-component.extension.ts similarity index 81% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/ufm-component.model.ts rename to src/Umbraco.Web.UI.Client/src/packages/ufm/ufm-component.extension.ts index 9cf61264f4..bf3c3ee9d5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/ufm-component.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/ufm/ufm-component.extension.ts @@ -13,3 +13,9 @@ export interface ManifestUfmComponent extends ManifestApi { type: 'ufmComponent'; meta: MetaUfmComponent; } + +declare global { + interface UmbExtensionManifestMap { + umbUfmComponent: ManifestUfmComponent; + } +} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/ufm-filter.model.ts b/src/Umbraco.Web.UI.Client/src/packages/ufm/ufm-filter.extension.ts similarity index 79% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/ufm-filter.model.ts rename to src/Umbraco.Web.UI.Client/src/packages/ufm/ufm-filter.extension.ts index 8144601021..30d6241c3f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/ufm-filter.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/ufm/ufm-filter.extension.ts @@ -12,3 +12,9 @@ export interface ManifestUfmFilter extends ManifestApi { type: 'ufmFilter'; meta: MetaUfmFilter; } + +declare global { + interface UmbExtensionManifestMap { + umbUfmFilter: ManifestUfmFilter; + } +} From 3ce3d5ba11b3129ec56262433086d32b238fe344 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 30 Sep 2024 14:27:18 +0200 Subject: [PATCH 2/6] move files --- .../src/packages/core/extension-registry/models/index.ts | 4 ---- .../input-content-picker-document-root.element.ts | 5 +---- .../content-picker/dynamic-root/dynamic-root.extension.ts} | 7 +++++++ .../property-editors/content-picker/dynamic-root/index.ts | 1 + .../modals/dynamic-root-origin-picker-modal.element.ts | 2 +- .../modals/dynamic-root-query-step-picker-modal.element.ts | 2 +- .../content-picker/dynamic-root/modals/index.ts | 5 +---- 7 files changed, 12 insertions(+), 14 deletions(-) rename src/Umbraco.Web.UI.Client/src/packages/{core/extension-registry/models/dynamic-root.model.ts => property-editors/content-picker/dynamic-root/dynamic-root.extension.ts} (77%) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts index 06257b9f62..c58c656892 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts @@ -1,15 +1,11 @@ -import type { ManifestDynamicRootOrigin, ManifestDynamicRootQueryStep } from './dynamic-root.model.js'; import type { ManifestFileUploadPreview } from './file-upload-preview.model.js'; import type { ManifestBase, ManifestBundle, ManifestCondition } from '@umbraco-cms/backoffice/extension-api'; -export type * from './dynamic-root.model.js'; export type * from './file-upload-preview.model.js'; export type ManifestTypes = | ManifestBundle | ManifestCondition - | ManifestDynamicRootOrigin - | ManifestDynamicRootQueryStep | ManifestFileUploadPreview | ManifestBase; diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/components/input-content-picker-document-root.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/components/input-content-picker-document-root.element.ts index aa75ca190b..901b185141 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/components/input-content-picker-document-root.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/components/input-content-picker-document-root.element.ts @@ -3,6 +3,7 @@ import { UMB_CONTENT_PICKER_DOCUMENT_ROOT_ORIGIN_PICKER_MODAL, UMB_CONTENT_PICKER_DOCUMENT_ROOT_QUERY_STEP_PICKER_MODAL, } from '../modals/index.js'; +import type { ManifestDynamicRootOrigin, ManifestDynamicRootQueryStep } from '../dynamic-root.extension.js'; import { html, css, customElement, property, ifDefined, state, repeat } from '@umbraco-cms/backoffice/external/lit'; import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; import { UmbId } from '@umbraco-cms/backoffice/id'; @@ -10,10 +11,6 @@ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbSorterController } from '@umbraco-cms/backoffice/sorter'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; -import type { - ManifestDynamicRootOrigin, - ManifestDynamicRootQueryStep, -} from '@umbraco-cms/backoffice/extension-registry'; import type { UmbModalContext } from '@umbraco-cms/backoffice/modal'; import { UmbFormControlMixin } from '@umbraco-cms/backoffice/validation'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/dynamic-root.model.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/dynamic-root.extension.ts similarity index 77% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/dynamic-root.model.ts rename to src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/dynamic-root.extension.ts index a9280cb7a5..ff327efc9d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/dynamic-root.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/dynamic-root.extension.ts @@ -23,3 +23,10 @@ export interface MetaDynamicRootQueryStep { description?: string; icon?: string; } + +declare global { + interface UmbExtensionManifestMap { + umbDynamicRootOrigin: ManifestDynamicRootOrigin; + umbDynamicRootQueryStep: ManifestDynamicRootQueryStep; + } +} diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/index.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/index.ts index aaec6ea6d6..ffa8abc835 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/index.ts @@ -1,3 +1,4 @@ export * from './modals/index.js'; export * from './repository/index.js'; export * from './components/index.js'; +export * from './dynamic-root.extension.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/modals/dynamic-root-origin-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/modals/dynamic-root-origin-picker-modal.element.ts index 1e11a7acfc..a922316bf3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/modals/dynamic-root-origin-picker-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/modals/dynamic-root-origin-picker-modal.element.ts @@ -1,9 +1,9 @@ import type { UmbContentPickerDynamicRoot } from '../../types.js'; +import type { ManifestDynamicRootOrigin } from '../dynamic-root.extension.js'; import type { UmbContentPickerDocumentRootOriginModalData } from './index.js'; import { html, customElement, state, ifDefined, repeat } from '@umbraco-cms/backoffice/external/lit'; import { UmbDocumentPickerInputContext } from '@umbraco-cms/backoffice/document'; import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal'; -import type { ManifestDynamicRootOrigin } from '@umbraco-cms/backoffice/extension-registry'; @customElement('umb-dynamic-root-origin-picker-modal') export class UmbDynamicRootOriginPickerModalModalElement extends UmbModalBaseElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/modals/dynamic-root-query-step-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/modals/dynamic-root-query-step-picker-modal.element.ts index 3546497199..a613d61828 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/modals/dynamic-root-query-step-picker-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/modals/dynamic-root-query-step-picker-modal.element.ts @@ -1,10 +1,10 @@ import type { UmbContentPickerDynamicRootQueryStep } from '../../types.js'; +import type { ManifestDynamicRootQueryStep } from '../dynamic-root.extension.js'; import type { UmbContentPickerDocumentRootQueryStepModalData } from './index.js'; import { UmbDocumentTypePickerInputContext } from '@umbraco-cms/backoffice/document-type'; import { UmbId } from '@umbraco-cms/backoffice/id'; import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal'; import { html, customElement, state, ifDefined, repeat } from '@umbraco-cms/backoffice/external/lit'; -import type { ManifestDynamicRootQueryStep } from '@umbraco-cms/backoffice/extension-registry'; @customElement('umb-dynamic-root-query-step-picker-modal') export class UmbDynamicRootQueryStepPickerModalModalElement extends UmbModalBaseElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/modals/index.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/modals/index.ts index 7f33922319..f77d455ed8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/modals/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/modals/index.ts @@ -1,11 +1,8 @@ +import type { ManifestDynamicRootOrigin, ManifestDynamicRootQueryStep } from '../dynamic-root.extension.js'; import { UMB_CONTENT_PICKER_DOCUMENT_ROOT_ORIGIN_PICKER_MODAL_ALIAS, UMB_CONTENT_PICKER_DOCUMENT_ROOT_QUERY_STEP_PICKER_MODAL_ALIAS, } from './constants.js'; -import type { - ManifestDynamicRootOrigin, - ManifestDynamicRootQueryStep, -} from '@umbraco-cms/backoffice/extension-registry'; import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; export interface UmbContentPickerDocumentRootOriginModalData { From 0b972fa47e9e7eb3c0176ddb2baef30a91080365 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 30 Sep 2024 14:51:46 +0200 Subject: [PATCH 3/6] move files --- .../packages/core/extension-registry/interfaces/index.ts | 1 - .../src/packages/core/extension-registry/models/index.ts | 9 +-------- .../input-upload-field/file-upload-preview.extension.ts} | 8 +++++++- .../input-upload-field}/file-upload-preview.interface.ts | 0 .../input-upload-field/input-upload-field.element.ts | 3 ++- 5 files changed, 10 insertions(+), 11 deletions(-) rename src/Umbraco.Web.UI.Client/src/packages/{core/extension-registry/models/file-upload-preview.model.ts => media/media/components/input-upload-field/file-upload-preview.extension.ts} (66%) rename src/Umbraco.Web.UI.Client/src/packages/{core/extension-registry/interfaces => media/media/components/input-upload-field}/file-upload-preview.interface.ts (100%) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/interfaces/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/interfaces/index.ts index 53756c0c15..35425d1cc6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/interfaces/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/interfaces/index.ts @@ -1,2 +1 @@ export * from './external-login-provider-element.interface.js'; -export * from './file-upload-preview.interface.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts index c58c656892..7c562c37af 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts @@ -1,13 +1,6 @@ -import type { ManifestFileUploadPreview } from './file-upload-preview.model.js'; import type { ManifestBase, ManifestBundle, ManifestCondition } from '@umbraco-cms/backoffice/extension-api'; -export type * from './file-upload-preview.model.js'; - -export type ManifestTypes = - | ManifestBundle - | ManifestCondition - | ManifestFileUploadPreview - | ManifestBase; +export type ManifestTypes = ManifestBundle | ManifestCondition | ManifestBase; type UnionOfProperties = T extends object ? T[keyof T] : never; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/file-upload-preview.model.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-upload-field/file-upload-preview.extension.ts similarity index 66% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/file-upload-preview.model.ts rename to src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-upload-field/file-upload-preview.extension.ts index 8482cc60dc..026e52e0ce 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/file-upload-preview.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-upload-field/file-upload-preview.extension.ts @@ -1,4 +1,4 @@ -import type { UmbFileUploadPreviewElement } from '../interfaces/file-upload-preview.interface.js'; +import type { UmbFileUploadPreviewElement } from './file-upload-preview.interface.js'; import type { ManifestElement } from '@umbraco-cms/backoffice/extension-api'; export interface ManifestFileUploadPreview extends ManifestElement { @@ -10,3 +10,9 @@ export interface ManifestFileUploadPreview extends ManifestElement; } + +declare global { + interface UmbExtensionManifestMap { + umbFileUploadPreview: ManifestFileUploadPreview; + } +} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/interfaces/file-upload-preview.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-upload-field/file-upload-preview.interface.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/interfaces/file-upload-preview.interface.ts rename to src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-upload-field/file-upload-preview.interface.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-upload-field/input-upload-field.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-upload-field/input-upload-field.element.ts index 7ef396d868..f78b2a70cb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-upload-field/input-upload-field.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-upload-field/input-upload-field.element.ts @@ -18,7 +18,8 @@ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; import { UmbExtensionsManifestInitializer } from '@umbraco-cms/backoffice/extension-api'; -import { type ManifestFileUploadPreview, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; +import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestFileUploadPreview } from './file-upload-preview.extension.js'; @customElement('umb-input-upload-field') export class UmbInputUploadFieldElement extends UmbLitElement { From 2612178b3410c5420663880f9da79d077e006b45 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 30 Sep 2024 14:53:11 +0200 Subject: [PATCH 4/6] export types --- .../packages/media/media/components/input-upload-field/index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-upload-field/index.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-upload-field/index.ts index 2807ab69a3..d68a0007a5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-upload-field/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-upload-field/index.ts @@ -1,2 +1,4 @@ export * from './preview/index.js'; export * from './input-upload-field.element.js'; +export * from './file-upload-preview.extension.js'; +export * from './file-upload-preview.interface.js'; From c639a776a8ce6143bcc0267d07b609f01ff9d7b7 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 30 Sep 2024 14:54:31 +0200 Subject: [PATCH 5/6] clean up --- .../external-login-provider-element.interface.ts | 0 .../src/packages/core/extension-registry/extensions/index.ts | 1 + .../src/packages/core/extension-registry/index.ts | 1 - .../src/packages/core/extension-registry/interfaces/index.ts | 1 - 4 files changed, 1 insertion(+), 2 deletions(-) rename src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/{interfaces => extensions}/external-login-provider-element.interface.ts (100%) delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/interfaces/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/interfaces/external-login-provider-element.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/extensions/external-login-provider-element.interface.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/interfaces/external-login-provider-element.interface.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/extensions/external-login-provider-element.interface.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/extensions/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/extensions/index.ts index af0ccaac03..83511202c3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/extensions/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/extensions/index.ts @@ -3,6 +3,7 @@ export type * from './backoffice-entry-point.extension.js'; export type * from './entity-action.extension.js'; export type * from './entity-bulk-action.extension.js'; export type * from './entry-point.extension.js'; +export type * from './external-login-provider-element.interface.js'; export type * from './external-login-provider.extension.js'; export type * from './global-context.extension.js'; export type * from './header-app.extension.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/index.ts index b369e8ac7f..12af91e886 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/index.ts @@ -2,7 +2,6 @@ export * from './conditions/index.js'; export * from './initializers/index.js'; export * from './registry.js'; export * from './utils/index.js'; -export type * from './interfaces/index.js'; export type * from './models/index.js'; export type * from './extensions/index.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/interfaces/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/interfaces/index.ts deleted file mode 100644 index 35425d1cc6..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/interfaces/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './external-login-provider-element.interface.js'; From 294090161394e7b4b0e26bdea226346ec43483c1 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 30 Sep 2024 14:55:25 +0200 Subject: [PATCH 6/6] Update external-login-provider.extension.ts --- .../extensions/external-login-provider.extension.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/extensions/external-login-provider.extension.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/extensions/external-login-provider.extension.ts index 214d115251..44c8870ac2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/extensions/external-login-provider.extension.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/extensions/external-login-provider.extension.ts @@ -1,4 +1,4 @@ -import type { UmbExternalLoginProviderElement } from '../interfaces/external-login-provider-element.interface.js'; +import type { UmbExternalLoginProviderElement } from './external-login-provider-element.interface.js'; import type { ManifestElement } from '@umbraco-cms/backoffice/extension-api'; export interface ManifestExternalLoginProvider extends ManifestElement {