Merge pull request #2377 from umbraco/v15/feature/emm-ufm

nielslyngsoe · web-flow · commit 8de0a071da3f · 2024-09-30T15:08:19.000+02:00
Extension Manifest Map: Ufm
diff --git a/examples/ufm-custom-component/index.ts b/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<ManifestUfmComponent> = [
 	{
diff --git a/src/packages/core/extension-registry/extensions/external-login-provider-element.interface.ts b/src/packages/core/extension-registry/extensions/external-login-provider-element.interface.ts
diff --git a/src/packages/core/extension-registry/extensions/external-login-provider.extension.ts b/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<UmbExternalLoginProviderElement> {
diff --git a/src/packages/core/extension-registry/extensions/index.ts b/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/packages/core/extension-registry/index.ts b/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/packages/core/extension-registry/interfaces/index.ts b/src/packages/core/extension-registry/interfaces/index.ts
diff --git a/src/packages/core/extension-registry/models/index.ts b/src/packages/core/extension-registry/models/index.ts
@@ -1,23 +1,6 @@
-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<ManifestTypes>
-	| ManifestCondition
-	| ManifestDynamicRootOrigin
-	| ManifestDynamicRootQueryStep
-	| ManifestFileUploadPreview
-	| ManifestUfmComponent
-	| ManifestUfmFilter
-	| ManifestBase;
+export type ManifestTypes = ManifestBundle<ManifestTypes> | ManifestCondition | ManifestBase;
 
 type UnionOfProperties<T> = T extends object ? T[keyof T] : never;
 
diff --git a/src/packages/media/media/components/input-upload-field/file-upload-preview.extension.ts b/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<UmbFileUploadPreviewElement> {
@@ -10,3 +10,9 @@ export interface ManifestFileUploadPreview extends ManifestElement<UmbFileUpload
 	 */
 	forMimeTypes: string | Array<string>;
 }
+
+declare global {
+	interface UmbExtensionManifestMap {
+		umbFileUploadPreview: ManifestFileUploadPreview;
+	}
+}
diff --git a/src/packages/media/media/components/input-upload-field/file-upload-preview.interface.ts b/src/packages/media/media/components/input-upload-field/file-upload-preview.interface.ts
diff --git a/src/packages/media/media/components/input-upload-field/index.ts b/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';
diff --git a/src/packages/media/media/components/input-upload-field/input-upload-field.element.ts b/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 {
diff --git a/src/packages/property-editors/content-picker/dynamic-root/components/input-content-picker-document-root.element.ts b/src/packages/property-editors/content-picker/dynamic-root/components/input-content-picker-document-root.element.ts
@@ -3,17 +3,14 @@ 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';
 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/packages/property-editors/content-picker/dynamic-root/dynamic-root.extension.ts b/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/packages/property-editors/content-picker/dynamic-root/index.ts b/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/packages/property-editors/content-picker/dynamic-root/modals/dynamic-root-origin-picker-modal.element.ts b/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<UmbContentPickerDocumentRootOriginModalData> {
diff --git a/src/packages/property-editors/content-picker/dynamic-root/modals/dynamic-root-query-step-picker-modal.element.ts b/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<UmbContentPickerDocumentRootQueryStepModalData> {
diff --git a/src/packages/property-editors/content-picker/dynamic-root/modals/index.ts b/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 {
diff --git a/src/packages/ufm/components/manifests.ts b/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<ManifestUfmComponent> = [
 	{
diff --git a/src/packages/ufm/components/ufm-component-base.ts b/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/packages/ufm/contexts/ufm.context.ts b/src/packages/ufm/contexts/ufm.context.ts
@@ -1,13 +1,14 @@
 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';
 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/packages/ufm/filters/manifests.ts b/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<ManifestUfmFilter> = [
 	{
diff --git a/src/packages/ufm/index.ts b/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/packages/ufm/types.ts b/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<unknown>): string | undefined | null;
diff --git a/src/packages/ufm/ufm-component.extension.ts b/src/packages/ufm/ufm-component.extension.ts
@@ -13,3 +13,9 @@ export interface ManifestUfmComponent extends ManifestApi<UmbUfmComponentApi> {
 	type: 'ufmComponent';
 	meta: MetaUfmComponent;
 }
+
+declare global {
+	interface UmbExtensionManifestMap {
+		umbUfmComponent: ManifestUfmComponent;
+	}
+}
diff --git a/src/packages/ufm/ufm-filter.extension.ts b/src/packages/ufm/ufm-filter.extension.ts
@@ -12,3 +12,9 @@ export interface ManifestUfmFilter extends ManifestApi<UmbUfmFilterApi> {
 	type: 'ufmFilter';
 	meta: MetaUfmFilter;
 }
+
+declare global {
+	interface UmbExtensionManifestMap {
+		umbUfmFilter: ManifestUfmFilter;
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { ManifestUfmComponent } from '@umbraco-cms/backoffice/extension-registry';`
	`1`	`+import type { ManifestUfmComponent } from '@umbraco-cms/backoffice/ufm';`
`2`	`2`
`3`	`3`	`export const manifests: Array<ManifestUfmComponent> = [`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { UmbExternalLoginProviderElement } from '../interfaces/external-login-provider-element.interface.js';`
	`1`	`+import type { UmbExternalLoginProviderElement } from './external-login-provider-element.interface.js';`
`2`	`2`	`import type { ManifestElement } from '@umbraco-cms/backoffice/extension-api';`
`3`	`3`
`4`	`4`	`export interface ManifestExternalLoginProvider extends ManifestElement<UmbExternalLoginProviderElement> {`