From 9e0614ff74a8ac88e01e07b09bcf5e7f1c7ff24e Mon Sep 17 00:00:00 2001
From: leekelleher <leekelleher@gmail.com>
Date: Mon, 17 Feb 2025 15:51:00 +0000
Subject: [PATCH] Tiptap: relocated the Block extension

---
 .../block/block.tipap-api.ts}                             | 0
 .../block/block.tiptap-toolbar-api.ts}                    | 0
 .../tiptap/{plugins => extensions/block}/manifests.ts     | 8 ++++----
 .../src/packages/tiptap/extensions/manifests.ts           | 3 ++-
 .../src/packages/tiptap/manifests.ts                      | 7 +------
 5 files changed, 7 insertions(+), 11 deletions(-)
 rename src/Umbraco.Web.UI.Client/src/packages/tiptap/{plugins/block.extension.ts => extensions/block/block.tipap-api.ts} (100%)
 rename src/Umbraco.Web.UI.Client/src/packages/tiptap/{plugins/block-picker-toolbar.extension.ts => extensions/block/block.tiptap-toolbar-api.ts} (100%)
 rename src/Umbraco.Web.UI.Client/src/packages/tiptap/{plugins => extensions/block}/manifests.ts (74%)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/plugins/block.extension.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/block/block.tipap-api.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/tiptap/plugins/block.extension.ts
rename to src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/block/block.tipap-api.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/plugins/block-picker-toolbar.extension.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/block/block.tiptap-toolbar-api.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/tiptap/plugins/block-picker-toolbar.extension.ts
rename to src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/block/block.tiptap-toolbar-api.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/plugins/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/block/manifests.ts
similarity index 74%
rename from src/Umbraco.Web.UI.Client/src/packages/tiptap/plugins/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/block/manifests.ts
index f2613a665d..06cac85ba4 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/plugins/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/block/manifests.ts
@@ -1,12 +1,12 @@
-import type { ManifestTiptapExtension } from '../extensions/tiptap.extension.js';
-import type { ManifestTiptapToolbarExtensionButtonKind } from '../extensions/tiptap-toolbar.extension.js';
+import type { ManifestTiptapExtension } from '../tiptap.extension.js';
+import type { ManifestTiptapToolbarExtensionButtonKind } from '../tiptap-toolbar.extension.js';
 
 export const manifests: Array<ManifestTiptapExtension | ManifestTiptapToolbarExtensionButtonKind> = [
 	{
 		type: 'tiptapExtension',
 		alias: 'Umb.Tiptap.Block',
 		name: 'Block Tiptap Extension',
-		api: () => import('./block.extension.js'),
+		api: () => import('./block.tipap-api.js'),
 		meta: {
 			icon: 'icon-plugin',
 			label: 'Block',
@@ -18,7 +18,7 @@ export const manifests: Array<ManifestTiptapExtension | ManifestTiptapToolbarExt
 		kind: 'button',
 		alias: 'Umb.Tiptap.Toolbar.BlockPicker',
 		name: 'Block Picker Tiptap Extension Button',
-		api: () => import('./block-picker-toolbar.extension.js'),
+		api: () => import('./block.tiptap-toolbar-api.js'),
 		forExtensions: ['Umb.Tiptap.Block'],
 		meta: {
 			alias: 'umbblockpicker',
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/manifests.ts
index 9e2e9fd7ca..786b3fdb54 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/manifests.ts
@@ -1,3 +1,4 @@
+import { manifests as blockExtensions } from './block/manifests.js';
 import type { ManifestTiptapExtension } from './tiptap.extension.js';
 import type { ManifestTiptapToolbarExtension } from './tiptap-toolbar.extension.js';
 import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
@@ -486,6 +487,6 @@ const toolbarExtensions: Array<ManifestTiptapToolbarExtension> = [
 	},
 ];
 
-const extensions = [...coreExtensions, ...toolbarExtensions];
+const extensions = [...coreExtensions, ...toolbarExtensions, ...blockExtensions];
 
 export const manifests = [...kinds, ...extensions];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/manifests.ts
index ee59b4ef2d..9325da5e4f 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/manifests.ts
@@ -1,10 +1,5 @@
 import { manifests as extensions } from './extensions/manifests.js';
 import { manifests as propertyEditors } from './property-editors/manifests.js';
-import { manifests as plugins } from './plugins/manifests.js';
 import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
 
-export const manifests: Array<UmbExtensionManifest | UmbExtensionManifestKind> = [
-	...extensions,
-	...propertyEditors,
-	...plugins,
-];
+export const manifests: Array<UmbExtensionManifest | UmbExtensionManifestKind> = [...extensions, ...propertyEditors];