From d077cceaf42a8a7dd584ea0674ac18327d523068 Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Mon, 30 Sep 2024 08:58:34 +0200
Subject: [PATCH] feat: move Umbraco.RichText to the root of the rte package

---
 .../property-editors/tiny-mce => }/Umbraco.RichText.ts     | 2 +-
 src/Umbraco.Web.UI.Client/src/packages/rte/manifests.ts    | 7 ++++++-
 .../rte/tiny-mce/property-editors/tiny-mce/manifests.ts    | 3 +--
 3 files changed, 8 insertions(+), 4 deletions(-)
 rename src/Umbraco.Web.UI.Client/src/packages/rte/{tiny-mce/property-editors/tiny-mce => }/Umbraco.RichText.ts (93%)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/rte/tiny-mce/property-editors/tiny-mce/Umbraco.RichText.ts b/src/Umbraco.Web.UI.Client/src/packages/rte/Umbraco.RichText.ts
similarity index 93%
rename from src/Umbraco.Web.UI.Client/src/packages/rte/tiny-mce/property-editors/tiny-mce/Umbraco.RichText.ts
rename to src/Umbraco.Web.UI.Client/src/packages/rte/Umbraco.RichText.ts
index 3dbe86e0a0..36fb6b3c94 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/rte/tiny-mce/property-editors/tiny-mce/Umbraco.RichText.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/rte/Umbraco.RichText.ts
@@ -5,7 +5,7 @@ export const manifest: ManifestPropertyEditorSchema = {
 	name: 'Rich Text',
 	alias: 'Umbraco.RichText',
 	meta: {
-		defaultPropertyEditorUiAlias: 'Umb.PropertyEditorUi.TinyMCE',
+		defaultPropertyEditorUiAlias: 'Umb.PropertyEditorUi.Tiptap',
 		settings: {
 			properties: [
 				{
diff --git a/src/Umbraco.Web.UI.Client/src/packages/rte/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/rte/manifests.ts
index 81d70617d7..acef781d4b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/rte/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/rte/manifests.ts
@@ -1,6 +1,11 @@
 // eslint-disable-next-line local-rules/no-relative-import-to-import-map-module
 import { manifests as tiptapManifests } from './tiptap/manifests.js';
 import { manifests as tinyMceManifests } from './tiny-mce/manifests.js';
+import { manifest as schemaManifest } from './Umbraco.RichText.js';
 import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
 
-export const manifests: Array<ManifestTypes | UmbExtensionManifestKind> = [...tinyMceManifests, ...tiptapManifests];
+export const manifests: Array<ManifestTypes | UmbExtensionManifestKind> = [
+	...tinyMceManifests,
+	...tiptapManifests,
+	schemaManifest,
+];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/rte/tiny-mce/property-editors/tiny-mce/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/rte/tiny-mce/property-editors/tiny-mce/manifests.ts
index 4e657fa2bc..cb68e5300c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/rte/tiny-mce/property-editors/tiny-mce/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/rte/tiny-mce/property-editors/tiny-mce/manifests.ts
@@ -1,4 +1,3 @@
-import { manifest as schemaManifest } from './Umbraco.RichText.js';
 import type { ManifestPropertyEditorUi } from '@umbraco-cms/backoffice/property-editor';
 
 export const UMB_BLOCK_RTE_PROPERTY_EDITOR_SCHEMA_ALIAS = 'Umbraco.RichText';
@@ -134,4 +133,4 @@ const manifest: ManifestPropertyEditorUi = {
 	},
 };
 
-export const manifests: Array<UmbExtensionManifest> = [manifest, schemaManifest];
+export const manifests: Array<UmbExtensionManifest> = [manifest];