Merge branch 'main' into v15/bugfix/discard-changes-path-compare

madsrasmussen · web-flow · commit 7e9f41958365 · 2024-09-30T07:32:00.000+02:00
diff --git a/src/packages/block/custom-view/custom-view.element.ts b/src/packages/block/custom-view/custom-view.element.ts
diff --git a/src/packages/block/custom-view/manifest.ts b/src/packages/block/custom-view/manifest.ts
diff --git a/src/packages/block/modals/manifest-viewer/manifest.ts b/src/packages/block/modals/manifest-viewer/manifest.ts
@@ -1,4 +1,4 @@
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 
 export const manifest: ManifestModal = {
 	type: 'modal',
diff --git a/src/packages/core/auth/modals/manifests.ts b/src/packages/core/auth/modals/manifests.ts
@@ -1,4 +1,4 @@
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 
 export const manifests: Array<ManifestModal> = [
 	{
diff --git a/src/packages/core/content-type/modals/composition-picker/manifest.ts b/src/packages/core/content-type/modals/composition-picker/manifest.ts
@@ -1,4 +1,4 @@
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 
 export const manifest: ManifestModal = {
 	type: 'modal',
diff --git a/src/packages/core/extension-registry/interfaces/index.ts b/src/packages/core/extension-registry/interfaces/index.ts
@@ -2,7 +2,6 @@ export * from './dashboard-element.interface.js';
 export * from './external-login-provider-element.interface.js';
 export * from './file-upload-preview.interface.js';
 export * from './menu-item-element.interface.js';
-export * from './modal-extension-element.interface.js';
 export * from './property-editor-ui-element.interface.js';
 export * from './section-element.interface.js';
 export * from './section-sidebar-app-element.interface.js';
diff --git a/src/packages/core/extension-registry/models/index.ts b/src/packages/core/extension-registry/models/index.ts
@@ -28,17 +28,13 @@ import type { ManifestIcons } from './icons.model.js';
 import type { ManifestLocalization } from './localization.model.js';
 import type { ManifestMenu } from './menu.model.js';
 import type { ManifestMenuItem, ManifestMenuItemLinkKind, ManifestMenuItemTreeKind } from './menu-item.model.js';
-import type { ManifestModal } from './modal.model.js';
-import type { ManifestPackageView } from './package-view.model.js';
 import type { ManifestPreviewAppProvider } from './preview-app.model.js';
-import type { ManifestPropertyAction, ManifestPropertyActionDefaultKind } from './property-action.model.js';
 import type { ManifestPropertyEditorUi, ManifestPropertyEditorSchema } from './property-editor.model.js';
 import type { ManifestRepository } from './repository.model.js';
 import type { ManifestSection } from './section.model.js';
 import type { ManifestSectionSidebarApp, ManifestSectionSidebarAppMenuKind } from './section-sidebar-app.model.js';
 import type { ManifestSectionView } from './section-view.model.js';
 import type { ManifestStore, ManifestTreeStore, ManifestItemStore } from './store.model.js';
-import type { ManifestTheme } from './theme.model.js';
 import type { ManifestTinyMcePlugin } from './tinymce-plugin.model.js';
 import type { ManifestUfmComponent } from './ufm-component.model.js';
 import type { ManifestUfmFilter } from './ufm-filter.model.js';
@@ -74,19 +70,15 @@ export type * from './localization.model.js';
 export type * from './menu-item.model.js';
 export type * from './menu.model.js';
 export type * from './mfa-login-provider.model.js';
-export type * from './modal.model.js';
 export type * from './monaco-markdown-editor-action.model.js';
-export type * from './package-view.model.js';
 export type * from './picker-search-result-item.model.js';
 export type * from './preview-app.model.js';
-export type * from './property-action.model.js';
 export type * from './property-editor.model.js';
 export type * from './repository.model.js';
 export type * from './section-sidebar-app.model.js';
 export type * from './section-view.model.js';
 export type * from './section.model.js';
 export type * from './store.model.js';
-export type * from './theme.model.js';
 export type * from './tinymce-plugin.model.js';
 export type * from './ufm-component.model.js';
 export type * from './ufm-filter.model.js';
@@ -109,8 +101,6 @@ export type ManifestEntityActions =
 	| ManifestEntityActionTrashKind
 	| ManifestEntityActionUpdateFolderKind;
 
-export type ManifestPropertyActions = ManifestPropertyAction | ManifestPropertyActionDefaultKind;
-
 export type ManifestTypes =
 	| ManifestAppEntryPoint
 	| ManifestAuthProvider
@@ -141,12 +131,9 @@ export type ManifestTypes =
 	| ManifestMenuItemTreeKind
 	| ManifestMenuItemLinkKind
 	| ManifestMfaLoginProvider
-	| ManifestModal
 	| ManifestMonacoMarkdownEditorAction
-	| ManifestPackageView
 	| ManifestPickerSearchResultItem
 	| ManifestPreviewAppProvider
-	| ManifestPropertyActions
 	| ManifestPropertyEditorSchema
 	| ManifestPropertyEditorUi
 	| ManifestRepository
@@ -156,7 +143,6 @@ export type ManifestTypes =
 	| ManifestSectionSidebarAppMenuKind
 	| ManifestSectionView
 	| ManifestStore
-	| ManifestTheme
 	| ManifestTinyMcePlugin
 	| ManifestTreeStore
 	| ManifestUfmComponent
diff --git a/src/packages/core/modal/component/modal-base.element.ts b/src/packages/core/modal/component/modal-base.element.ts
@@ -1,7 +1,7 @@
 import type { UmbModalRejectReason, UmbModalContext } from '../context/index.js';
 import { property } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
-import type { ManifestModal, UmbModalExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal, UmbModalExtensionElement } from '@umbraco-cms/backoffice/modal';
 
 export abstract class UmbModalBaseElement<
 		ModalDataType extends object = object,
diff --git a/src/packages/core/modal/component/modal.element.ts b/src/packages/core/modal/component/modal.element.ts
@@ -1,7 +1,7 @@
 import type { UmbModalContext } from '../context/modal.context.js';
 import { UMB_MODAL_CONTEXT } from '../context/modal.context-token.js';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import type { CSSResultGroup } from '@umbraco-cms/backoffice/external/lit';
diff --git a/src/packages/core/modal/extensions/index.ts b/src/packages/core/modal/extensions/index.ts
@@ -0,0 +1,9 @@
+export type * from './modal-extension-element.interface.js';
+export type * from './modal.extension.js';
+import type { ManifestModal } from './modal.extension.js';
+
+declare global {
+	interface UmbExtensionManifestMap {
+		UmbModalExtension: ManifestModal;
+	}
+}
diff --git a/src/packages/core/modal/extensions/modal-extension-element.interface.ts b/src/packages/core/modal/extensions/modal-extension-element.interface.ts
@@ -1,4 +1,4 @@
-import type { ManifestModal } from '../models/index.js';
+import type { ManifestModal } from './modal.extension.js';
 import type { UmbModalContext } from '@umbraco-cms/backoffice/modal';
 
 export interface UmbModalExtensionElement<
diff --git a/src/packages/core/modal/extensions/modal.extension.ts b/src/packages/core/modal/extensions/modal.extension.ts
@@ -1,4 +1,4 @@
-import type { UmbModalExtensionElement } from '../interfaces/modal-extension-element.interface.js';
+import type { UmbModalExtensionElement } from './modal-extension-element.interface.js';
 import type { ManifestElement } from '@umbraco-cms/backoffice/extension-api';
 
 export interface ManifestModal
diff --git a/src/packages/core/modal/types.ts b/src/packages/core/modal/types.ts
@@ -1,3 +1,5 @@
+export * from './extensions/index.js';
+
 export interface UmbPickerModalData<ItemType> {
 	multiple?: boolean;
 	filter?: (item: ItemType) => boolean;
diff --git a/src/packages/core/property-action/components/property-action-menu/property-action-menu.element.ts b/src/packages/core/property-action/components/property-action-menu/property-action-menu.element.ts
@@ -1,7 +1,7 @@
 import type { UmbPropertyActionArgs } from '../property-action/types.js';
 import { css, customElement, html, nothing, property, repeat, state } from '@umbraco-cms/backoffice/external/lit';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
-import type { ManifestPropertyAction, MetaPropertyAction } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestPropertyAction, MetaPropertyAction } from '@umbraco-cms/backoffice/property-action';
 import { UmbExtensionsElementAndApiInitializer } from '@umbraco-cms/backoffice/extension-api';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
diff --git a/src/packages/core/property-action/components/property-action/default/property-action.element.ts b/src/packages/core/property-action/components/property-action/default/property-action.element.ts
@@ -1,11 +1,12 @@
 import type { UmbPropertyAction } from '../index.js';
-import { UmbActionExecutedEvent } from '@umbraco-cms/backoffice/event';
-import { html, customElement, property, state, ifDefined, nothing } from '@umbraco-cms/backoffice/external/lit';
-import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import type {
 	ManifestPropertyActionDefaultKind,
 	MetaPropertyActionDefaultKind,
-} from '@umbraco-cms/backoffice/extension-registry';
+} from '../../../extensions/property-action.extension.js';
+import { UmbActionExecutedEvent } from '@umbraco-cms/backoffice/event';
+import { html, customElement, property, state, ifDefined, nothing } from '@umbraco-cms/backoffice/external/lit';
+import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+
 import type { UUIMenuItemEvent } from '@umbraco-cms/backoffice/external/uui';
 
 @customElement('umb-property-action')
diff --git a/src/packages/core/property-action/extensions/property-action.extension.ts b/src/packages/core/property-action/extensions/property-action.extension.ts
@@ -1,4 +1,4 @@
-import type { UmbPropertyAction } from '../../property-action/components/property-action/property-action.interface.js';
+import type { UmbPropertyAction } from '../components/property-action/property-action.interface.js';
 import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api';
 
@@ -39,3 +39,11 @@ export interface MetaPropertyActionDefaultKind extends MetaPropertyAction {
 	 */
 	label: string;
 }
+
+export type UmbPropertyActionExtensions = ManifestPropertyAction | ManifestPropertyActionDefaultKind;
+
+declare global {
+	interface UmbExtensionManifestMap {
+		UmbPropertyActionExtensions: UmbPropertyActionExtensions;
+	}
+}
diff --git a/src/packages/core/property-action/index.ts b/src/packages/core/property-action/index.ts
@@ -1 +1,2 @@
 export * from './components/index.js';
+export * from './extensions/property-action.extension.js';
diff --git a/src/packages/core/server-file-system/rename/modal/manifests.ts b/src/packages/core/server-file-system/rename/modal/manifests.ts
@@ -1,4 +1,4 @@
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 
 export const UMB_RENAME_SERVER_FILE_MODAL_ALIAS = 'Umb.Modal.ServerFile.Rename';
 
diff --git a/src/packages/core/themes/index.ts b/src/packages/core/themes/index.ts
@@ -1 +1,2 @@
 export * from './theme.context.js';
+export type * from './theme.extension.js';
diff --git a/src/packages/core/themes/manifests.ts b/src/packages/core/themes/manifests.ts
@@ -1,6 +1,4 @@
-import type { ManifestGlobalContext, ManifestTheme } from '@umbraco-cms/backoffice/extension-registry';
-
-export const themes: Array<ManifestGlobalContext | ManifestTheme> = [
+export const themes: Array<UmbExtensionManifest> = [
 	{
 		type: 'globalContext',
 		alias: 'Umb.GlobalContext.Theme',
diff --git a/src/packages/core/themes/theme.context.ts b/src/packages/core/themes/theme.context.ts
@@ -3,7 +3,7 @@ import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registr
 import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
 import { UmbStringState } from '@umbraco-cms/backoffice/observable-api';
-import type { ManifestTheme } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestTheme } from '@umbraco-cms/backoffice/themes';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import type { UmbObserverController } from '@umbraco-cms/backoffice/observable-api';
 
diff --git a/src/packages/core/themes/theme.extension.ts b/src/packages/core/themes/theme.extension.ts
@@ -5,3 +5,9 @@ import type { ManifestPlainCss } from '@umbraco-cms/backoffice/extension-api';
 export interface ManifestTheme extends ManifestPlainCss {
 	type: 'theme';
 }
+
+declare global {
+	interface UmbExtensionManifestMap {
+		UMB_THEME: ManifestTheme;
+	}
+}
diff --git a/src/packages/core/tree/entity-actions/duplicate-to/modal/manifests.ts b/src/packages/core/tree/entity-actions/duplicate-to/modal/manifests.ts
@@ -1,5 +1,5 @@
 import { UMB_DUPLICATE_TO_MODAL_ALIAS } from './constants.js';
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 
 export const manifests: Array<ManifestModal> = [
 	{
diff --git a/src/packages/core/tree/entity-actions/sort-children-of/modal/manifests.ts b/src/packages/core/tree/entity-actions/sort-children-of/modal/manifests.ts
@@ -1,5 +1,5 @@
 import { UMB_SORT_CHILDREN_OF_MODAL_ALIAS } from './constants.js';
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 
 export const manifests: Array<ManifestModal> = [
 	{
diff --git a/src/packages/documents/document-types/entity-actions/import/modal/manifests.ts b/src/packages/documents/document-types/entity-actions/import/modal/manifests.ts
@@ -1,4 +1,4 @@
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 
 export const manifests: Array<ManifestModal> = [
 	{
diff --git a/src/packages/documents/documents/entity-actions/duplicate/modal/manifests.ts b/src/packages/documents/documents/entity-actions/duplicate/modal/manifests.ts
@@ -1,5 +1,5 @@
 import { UMB_DUPLICATE_DOCUMENT_MODAL_ALIAS } from './constants.js';
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 
 export const manifests: Array<ManifestModal> = [
 	{
diff --git a/src/packages/documents/documents/entity-actions/notifications/modal/manifests.ts b/src/packages/documents/documents/entity-actions/notifications/modal/manifests.ts
@@ -1,4 +1,4 @@
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 
 export const UMB_DOCUMENT_NOTIFICATIONS_MODAL_ALIAS = 'Umb.Modal.DocumentNotifications';
 
diff --git a/src/packages/documents/documents/modals/manifests.ts b/src/packages/documents/documents/modals/manifests.ts
@@ -1,4 +1,4 @@
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 
 export const UMB_DOCUMENT_SAVE_MODAL_ALIAS = 'Umb.Modal.DocumentSave';
 export const UMB_DOCUMENT_PUBLISH_MODAL_ALIAS = 'Umb.Modal.DocumentPublish';
diff --git a/src/packages/documents/documents/rollback/modal/manifests.ts b/src/packages/documents/documents/rollback/modal/manifests.ts
@@ -1,7 +1,6 @@
 import { UMB_ROLLBACK_MODAL_ALIAS } from './constants.js';
-import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
 
-export const manifests: Array<ManifestTypes> = [
+export const manifests: Array<UmbExtensionManifest> = [
 	{
 		type: 'modal',
 		alias: UMB_ROLLBACK_MODAL_ALIAS,
diff --git a/src/packages/media/media-types/entity-actions/import/modal/manifests.ts b/src/packages/media/media-types/entity-actions/import/modal/manifests.ts
@@ -1,4 +1,4 @@
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 
 export const manifests: Array<ManifestModal> = [
 	{
diff --git a/src/packages/media/media/modals/image-cropper-editor/manifests.ts b/src/packages/media/media/modals/image-cropper-editor/manifests.ts
@@ -1,4 +1,4 @@
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 
 const modals: Array<ManifestModal> = [
 	{
diff --git a/src/packages/media/media/modals/media-picker/manifests.ts b/src/packages/media/media/modals/media-picker/manifests.ts
@@ -1,4 +1,4 @@
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 
 const modals: Array<ManifestModal> = [
 	{
diff --git a/src/packages/members/member/entity-actions/create/manifests.ts b/src/packages/members/member/entity-actions/create/manifests.ts
@@ -1,7 +1,6 @@
 import { UMB_MEMBER_ROOT_ENTITY_TYPE } from '../../entity.js';
-import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
 
-const entityActions: Array<ManifestTypes> = [
+export const manifests: Array<UmbExtensionManifest> = [
 	{
 		type: 'entityAction',
 		kind: 'default',
@@ -16,15 +15,10 @@ const entityActions: Array<ManifestTypes> = [
 			additionalOptions: true,
 		},
 	},
-];
-
-const modals: Array<ManifestTypes> = [
 	{
 		type: 'modal',
 		alias: 'Umb.Modal.Member.CreateOptions',
 		name: 'Member Create Options Modal',
-		js: () => import('./member-create-options-modal.element.js'),
+		element: () => import('./member-create-options-modal.element.js'),
 	},
 ];
-
-export const manifests: Array<ManifestTypes> = [...entityActions, ...modals];
diff --git a/src/packages/packages/package-section/views/installed/installed-packages-section-view-item.element.ts b/src/packages/packages/package-section/views/installed/installed-packages-section-view-item.element.ts
@@ -6,9 +6,9 @@ import { umbConfirmModal } from '@umbraco-cms/backoffice/modal';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification';
-import type { ManifestPackageView } from '@umbraco-cms/backoffice/extension-registry';
 import type { UmbNotificationContext } from '@umbraco-cms/backoffice/notification';
 import type { UUIButtonState } from '@umbraco-cms/backoffice/external/uui';
+import type { ManifestPackageView } from '@umbraco-cms/backoffice/package';
 
 @customElement('umb-installed-packages-section-view-item')
 export class UmbInstalledPackagesSectionViewItemElement extends UmbLitElement {
diff --git a/src/packages/packages/package/extensions/index.ts b/src/packages/packages/package/extensions/index.ts
@@ -0,0 +1,8 @@
+import type { ManifestPackageView } from './package-view.model.js';
+export type * from './package-view.model.js';
+
+declare global {
+	interface UmbExtensionManifestMap {
+		ManifestPackageView: ManifestPackageView;
+	}
+}
diff --git a/src/packages/packages/package/extensions/package-view.model.ts b/src/packages/packages/package/extensions/package-view.model.ts
diff --git a/src/packages/packages/package/index.ts b/src/packages/packages/package/index.ts
@@ -1 +1,2 @@
+export * from './extensions/index.js';
 export * from './repository/index.js';
diff --git a/src/packages/templating/modals/manifests.ts b/src/packages/templating/modals/manifests.ts
@@ -1,4 +1,4 @@
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 
 export const manifests: Array<ManifestModal> = [
 	{
diff --git a/src/packages/user/current-user/external-login/manifests.ts b/src/packages/user/current-user/external-login/manifests.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';`
	`1`	`+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';`
`2`	`2`
`3`	`3`	`export const manifest: ManifestModal = {`
`4`	`4`	`type: 'modal',`