Merge branch 'main' into v15/feature/emm-tiny-mce-plugin

# Conflicts:
#	src/packages/core/extension-registry/models/index.ts

Author: nielslyngsoe

src/packages/core/extension-registry/extensions/index.ts

@@ -2,7 +2,6 @@ export type * from './app-entry-point.extension.js';
 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 './entity-user-permission.extension.js';
 export type * from './entry-point.extension.js';
 export type * from './global-context.extension.js';
 export type * from './header-app.extension.js';

src/packages/core/extension-registry/models/index.ts

@@ -6,9 +6,7 @@ import type { ManifestExternalLoginProvider } from './external-login-provider.mo
 import type { ManifestUfmComponent } from './ufm-component.model.js';
 import type { ManifestUfmFilter } from './ufm-filter.model.js';
 import type { ManifestUserProfileApp } from './user-profile-app.model.js';
-import type { ManifestGranularUserPermission } from './user-granular-permission.model.js';
 import type { ManifestMfaLoginProvider } from './mfa-login-provider.model.js';
-import type { ManifestMonacoMarkdownEditorAction } from './monaco-markdown-editor-action.model.js';
 import type { ManifestBase, ManifestBundle, ManifestCondition } from '@umbraco-cms/backoffice/extension-api';
 
 export type * from './auth-provider.model.js';
@@ -17,14 +15,8 @@ export type * from './dynamic-root.model.js';
 export type * from './file-upload-preview.model.js';
 export type * from './external-login-provider.model.js';
 export type * from './mfa-login-provider.model.js';
-export type * from './monaco-markdown-editor-action.model.js';
-export type * from './mfa-login-provider.model.js';
-export type * from './monaco-markdown-editor-action.model.js';
-export type * from './mfa-login-provider.model.js';
-export type * from './monaco-markdown-editor-action.model.js';
 export type * from './ufm-component.model.js';
 export type * from './ufm-filter.model.js';
-export type * from './user-granular-permission.model.js';
 export type * from './user-profile-app.model.js';
 
 export type ManifestTypes =
@@ -37,9 +29,7 @@ export type ManifestTypes =
 	| ManifestDynamicRootQueryStep
 	| ManifestFileUploadPreview
 	| ManifestExternalLoginProvider
-	| ManifestGranularUserPermission
 	| ManifestMfaLoginProvider
-	| ManifestMonacoMarkdownEditorAction
 	| ManifestUfmComponent
 	| ManifestUfmFilter
 	| ManifestUserProfileApp

src/packages/documents/documents/user-permissions/input-document-granular-user-permission/input-document-granular-user-permission.element.ts

@@ -7,10 +7,12 @@ import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal';
 import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
 import type { UmbDeselectedEvent } from '@umbraco-cms/backoffice/event';
 import { UmbChangeEvent, UmbSelectedEvent } from '@umbraco-cms/backoffice/event';
-import type { ManifestEntityUserPermission } from '@umbraco-cms/backoffice/extension-registry';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 import { UUIFormControlMixin } from '@umbraco-cms/backoffice/external/uui';
-import { UMB_ENTITY_USER_PERMISSION_MODAL } from '@umbraco-cms/backoffice/user-permission';
+import {
+	UMB_ENTITY_USER_PERMISSION_MODAL,
+	type ManifestEntityUserPermission,
+} from '@umbraco-cms/backoffice/user-permission';
 
 @customElement('umb-input-document-granular-user-permission')
 export class UmbInputDocumentGranularUserPermissionElement extends UUIFormControlMixin(UmbLitElement, '') {

src/packages/documents/documents/user-permissions/manifests.ts

@@ -21,7 +21,7 @@ import { manifests as conditionManifests } from './conditions/manifests.js';
 import type {
 	ManifestGranularUserPermission,
 	ManifestEntityUserPermission,
-} from '@umbraco-cms/backoffice/extension-registry';
+} from '@umbraco-cms/backoffice/user-permission';
 
 const permissions: Array<ManifestEntityUserPermission> = [
 	{

src/packages/markdown-editor/index.ts

@@ -1 +1,2 @@
 export * from './components/index.js';
+export * from './monaco-markdown-editor-action.extension.js';

src/packages/core/extension-registry/models/monaco-markdown-editor-action.model.ts renamed to src/packages/markdown-editor/monaco-markdown-editor-action.extension.ts

@@ -6,3 +6,9 @@ export interface ManifestMonacoMarkdownEditorAction extends ManifestApi<any> {
 }
 
 export type MetaMonacoMarkdownEditorAction = object;
+
+declare global {
+	interface UmbExtensionManifestMap {
+		umbMonacoMarkdownEditorAction: ManifestMonacoMarkdownEditorAction;
+	}
+}

src/packages/user/user-group/components/user-group-ref/user-group-ref.element.ts

@@ -1,9 +1,9 @@
 import { UUIRefNodeElement } from '@umbraco-cms/backoffice/external/uui';
 import { customElement, html, property } from '@umbraco-cms/backoffice/external/lit';
 import { UmbElementMixin } from '@umbraco-cms/backoffice/element-api';
-import type { ManifestEntityUserPermission } from '@umbraco-cms/backoffice/extension-registry';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 import { map } from '@umbraco-cms/backoffice/external/rxjs';
+import type { ManifestEntityUserPermission } from '@umbraco-cms/backoffice/user-permission';
 
 /**
  *  @element umb-user-group-ref

src/packages/user/user-group/workspace/user-group/components/user-group-granular-permission-list.element.ts

@@ -1,7 +1,7 @@
 import { UMB_USER_GROUP_WORKSPACE_CONTEXT } from '../user-group-workspace.context-token.js';
 import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
 import { createExtensionElement } from '@umbraco-cms/backoffice/extension-api';
-import type { ManifestGranularUserPermission } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestGranularUserPermission } from '@umbraco-cms/backoffice/user-permission';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 import { html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';

src/packages/user/user-permission/components/input-entity-user-permission/input-entity-user-permission.element.ts

@@ -1,5 +1,5 @@
+import type { ManifestEntityUserPermission } from '../../entity-user-permission.extension.js';
 import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
-import type { ManifestEntityUserPermission } from '@umbraco-cms/backoffice/extension-registry';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 import { html, customElement, property, state, nothing, ifDefined } from '@umbraco-cms/backoffice/external/lit';
 import type { UmbObserverController } from '@umbraco-cms/backoffice/observable-api';

src/packages/core/extension-registry/extensions/entity-user-permission.extension.ts renamed to src/packages/user/user-permission/entity-user-permission.extension.ts

@@ -15,6 +15,6 @@ export interface MetaEntityUserPermission {
 
 declare global {
 	interface UmbExtensionManifestMap {
-		UmbEntityUserPermissionExtension: ManifestEntityUserPermission;
+		umbEntityUserPermission: ManifestEntityUserPermission;
 	}
 }