From b9b4fb81d5ee7d79c2fb0c67dfe13c33231ea37f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Fri, 27 Sep 2024 12:35:58 +0200
Subject: [PATCH] move tinyMCE plugin

---
 .../src/packages/block/block-rte/manifests.ts   |  3 +--
 .../block-rte/tiny-mce-plugin/manifests.ts      | 17 -----------------
 .../src/packages/tiny-mce/plugins/manifests.ts  | 15 +++++++++++++++
 .../plugins}/tiny-mce-block-picker.plugin.ts    |  4 ++--
 4 files changed, 18 insertions(+), 21 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/block/block-rte/tiny-mce-plugin/manifests.ts
 rename src/Umbraco.Web.UI.Client/src/packages/{block/block-rte/tiny-mce-plugin => tiny-mce/plugins}/tiny-mce-block-picker.plugin.ts (91%)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/manifests.ts
index 0f70e08783..db401f3ea2 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/manifests.ts
@@ -1,4 +1,3 @@
-import { manifests as tinyMcePluginManifests } from './tiny-mce-plugin/manifests.js';
 import { manifests as workspaceManifests } from './workspace/manifests.js';
 
-export const manifests: Array<UmbExtensionManifest> = [...tinyMcePluginManifests, ...workspaceManifests];
+export const manifests: Array<UmbExtensionManifest> = workspaceManifests;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/tiny-mce-plugin/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/tiny-mce-plugin/manifests.ts
deleted file mode 100644
index b549d60854..0000000000
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/tiny-mce-plugin/manifests.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-export const manifests = [
-	{
-		type: 'tinyMcePlugin',
-		alias: 'Umb.TinyMcePlugin.BlockPicker',
-		name: 'Block Picker TinyMCE Plugin',
-		js: () => import('./tiny-mce-block-picker.plugin.js'),
-		meta: {
-			toolbar: [
-				{
-					alias: 'umbblockpicker',
-					label: '#blockEditor_insertBlock',
-					icon: 'visualblocks',
-				},
-			],
-		},
-	},
-];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/plugins/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/plugins/manifests.ts
index e70a612d5e..f257fa8226 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/plugins/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/plugins/manifests.ts
@@ -46,4 +46,19 @@ export const manifests: Array<ManifestTinyMcePlugin> = [
 			],
 		},
 	},
+	{
+		type: 'tinyMcePlugin',
+		alias: 'Umb.TinyMcePlugin.BlockPicker',
+		name: 'Block Picker TinyMCE Plugin',
+		js: () => import('./tiny-mce-block-picker.plugin.js'),
+		meta: {
+			toolbar: [
+				{
+					alias: 'umbblockpicker',
+					label: '#blockEditor_insertBlock',
+					icon: 'visualblocks',
+				},
+			],
+		},
+	},
 ];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/tiny-mce-plugin/tiny-mce-block-picker.plugin.ts b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/plugins/tiny-mce-block-picker.plugin.ts
similarity index 91%
rename from src/Umbraco.Web.UI.Client/src/packages/block/block-rte/tiny-mce-plugin/tiny-mce-block-picker.plugin.ts
rename to src/Umbraco.Web.UI.Client/src/packages/tiny-mce/plugins/tiny-mce-block-picker.plugin.ts
index 629613863c..43265dca4d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/tiny-mce-plugin/tiny-mce-block-picker.plugin.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/plugins/tiny-mce-block-picker.plugin.ts
@@ -1,5 +1,5 @@
-import { UMB_BLOCK_RTE_MANAGER_CONTEXT } from '../context/block-rte-manager.context-token.js';
-import { UMB_BLOCK_RTE_ENTRIES_CONTEXT } from '../context/block-rte-entries.context-token.js';
+import { UMB_BLOCK_RTE_MANAGER_CONTEXT } from '../../block/block-rte/context/block-rte-manager.context-token.js';
+import { UMB_BLOCK_RTE_ENTRIES_CONTEXT } from '../../block/block-rte/context/block-rte-entries.context-token.js';
 import { type TinyMcePluginArguments, UmbTinyMcePluginBase } from '@umbraco-cms/backoffice/tiny-mce';
 import { UmbLocalizationController } from '@umbraco-cms/backoffice/localization-api';
 import type { UmbBlockTypeBaseModel } from '@umbraco-cms/backoffice/block-type';