Merge pull request #2379 from umbraco/v15/feature/emm-dynamic-root

Extension Manifest Map: Dynamic Root
umbraco · Sep 30, 2024 · e5375c5 · e5375c5
2 parents 51eb7c4 + 5daa0ed
commit e5375c5
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 14 deletions.
diff --git a/src/packages/core/extension-registry/models/index.ts b/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<ManifestTypes>
 	| ManifestCondition
-	| ManifestDynamicRootOrigin
-	| ManifestDynamicRootQueryStep
 	| ManifestFileUploadPreview
 	| ManifestBase;
 

diff --git a/...tors/content-picker/dynamic-root/components/input-content-picker-document-root.element.ts b/...tors/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/...ion-registry/models/dynamic-root.model.ts → ...er/dynamic-root/dynamic-root.extension.ts b/...ion-registry/models/dynamic-root.model.ts → ...er/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/...ty-editors/content-picker/dynamic-root/modals/dynamic-root-origin-picker-modal.element.ts b/...ty-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/...ditors/content-picker/dynamic-root/modals/dynamic-root-query-step-picker-modal.element.ts b/...ditors/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 {