From ebc37cedddf76244649662544e5c6d9715a9efba Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 30 Sep 2024 14:12:26 +0200 Subject: [PATCH] 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; + } +}