Merge branch 'main' into v15/feature/login-providers

src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts

@@ -1,13 +1,11 @@
 import type { ManifestDynamicRootOrigin, ManifestDynamicRootQueryStep } from './dynamic-root.model.js';
 import type { ManifestFileUploadPreview } from './file-upload-preview.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';
 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 './tinymce-plugin.model.js';
 export type * from './ufm-component.model.js';
 export type * from './ufm-filter.model.js';
 
@@ -17,7 +15,6 @@ export type ManifestTypes =
 	| ManifestDynamicRootOrigin
 	| ManifestDynamicRootQueryStep
 	| ManifestFileUploadPreview
-	| ManifestTinyMcePlugin
 	| ManifestUfmComponent
 	| ManifestUfmFilter
 	| ManifestBase;

src/Umbraco.Web.UI.Client/src/packages/tiny-mce/components/input-tiny-mce/input-tiny-mce.element.ts

@@ -6,7 +6,7 @@ import type { UmbTinyMcePluginBase } from './tiny-mce-plugin.js';
 import { type ClassConstructor, loadManifestApi } from '@umbraco-cms/backoffice/extension-api';
 import { css, customElement, html, property, query } from '@umbraco-cms/backoffice/external/lit';
 import { getProcessedImageUrl, umbDeepMerge } from '@umbraco-cms/backoffice/utils';
-import { type ManifestTinyMcePlugin, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
+import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbStylesheetDetailRepository, UmbStylesheetRuleManager } from '@umbraco-cms/backoffice/stylesheet';
@@ -18,6 +18,7 @@ import {
 	renderEditor,
 } from '@umbraco-cms/backoffice/external/tinymce';
 import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
+import type { ManifestTinyMcePlugin } from '@umbraco-cms/backoffice/tiny-mce';
 
 /**
  * Handles the resize event

src/Umbraco.Web.UI.Client/src/packages/tiny-mce/index.ts

@@ -1,2 +1,3 @@
 export * from './components/index.js';
 export * from './modals/index.js';
+export * from './plugins/index.js';

src/Umbraco.Web.UI.Client/src/packages/tiny-mce/plugins/index.ts

@@ -0,0 +1 @@
+export * from './tinymce-plugin.extension.js';

src/Umbraco.Web.UI.Client/src/packages/tiny-mce/plugins/manifests.ts

@@ -1,4 +1,4 @@
-import type { ManifestTinyMcePlugin } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestTinyMcePlugin } from './tinymce-plugin.extension.js';
 
 export const manifests: Array<ManifestTinyMcePlugin> = [
 	{

src/Umbraco.Web.UI.Client/src/packages/tiny-mce/plugins/tinymce-plugin.extension.ts

@@ -53,3 +53,9 @@ export interface ManifestTinyMcePlugin extends ManifestApi<UmbTinyMcePluginBase>
 	type: 'tinyMcePlugin';
 	meta?: MetaTinyMcePlugin;
 }
+
+declare global {
+	interface UmbExtensionManifestMap {
+		umbTinyMcePlugin: ManifestTinyMcePlugin;
+	}
+}