From 80a9ba9c42043a5673214983f96b046ce12f6a5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Sun, 29 Sep 2024 19:56:35 +0200
Subject: [PATCH] move icons

---
 .../src/packages/core/extension-registry/models/index.ts    | 3 ---
 .../extensions/icons.extension.ts}                          | 6 ++++++
 .../packages/core/icon-registry/icon-registry.context.ts    | 3 ++-
 .../src/packages/core/icon-registry/index.ts                | 3 ++-
 4 files changed, 10 insertions(+), 5 deletions(-)
 rename src/Umbraco.Web.UI.Client/src/packages/core/{extension-registry/models/icons.model.ts => icon-registry/extensions/icons.extension.ts} (72%)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts
index 3702bb3970..0e63175b39 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts
@@ -24,7 +24,6 @@ import type { ManifestExternalLoginProvider } from './external-login-provider.mo
 import type { ManifestGlobalContext } from './global-context.model.js';
 import type { ManifestHeaderApp, ManifestHeaderAppButtonKind } from './header-app.model.js';
 import type { ManifestHealthCheck } from './health-check.model.js';
-import type { ManifestIcons } from './icons.model.js';
 import type { ManifestLocalization } from './localization.model.js';
 import type { ManifestMenu } from './menu.model.js';
 import type { ManifestMenuItem, ManifestMenuItemLinkKind, ManifestMenuItemTreeKind } from './menu-item.model.js';
@@ -67,7 +66,6 @@ export type * from './external-login-provider.model.js';
 export type * from './global-context.model.js';
 export type * from './header-app.model.js';
 export type * from './health-check.model.js';
-export type * from './icons.model.js';
 export type * from './localization.model.js';
 export type * from './menu-item.model.js';
 export type * from './menu.model.js';
@@ -129,7 +127,6 @@ export type ManifestTypes =
 	| ManifestHeaderApp
 	| ManifestHeaderAppButtonKind
 	| ManifestHealthCheck
-	| ManifestIcons
 	| ManifestItemStore
 	| ManifestLocalization
 	| ManifestMenu
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/icons.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/extensions/icons.extension.ts
similarity index 72%
rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/icons.model.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/extensions/icons.extension.ts
index 97015f568e..79c31f97fb 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/icons.model.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/extensions/icons.extension.ts
@@ -4,3 +4,9 @@ import type { ManifestPlainJs } from '@umbraco-cms/backoffice/extension-api';
 export interface ManifestIcons extends ManifestPlainJs<{ default: UmbIconDictionary }> {
 	type: 'icons';
 }
+
+declare global {
+	interface UmbExtensionManifestMap {
+		UmbIconsExtension: ManifestIcons;
+	}
+}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-registry.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-registry.context.ts
index d479851c79..ec704b6ed0 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-registry.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-registry.context.ts
@@ -5,7 +5,8 @@ import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { loadManifestPlainJs } from '@umbraco-cms/backoffice/extension-api';
 import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api';
-import { type ManifestIcons, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
+import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestIcons } from '@umbraco-cms/backoffice/icon';
 
 export class UmbIconRegistryContext extends UmbContextBase<UmbIconRegistryContext> {
 	#registry: UmbIconRegistry;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/index.ts
index 357b048da7..1da66f89d4 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/index.ts
@@ -1,5 +1,6 @@
+export * from './icon-picker-modal/index.js';
 export * from './icon-registry.context-token.js';
 export * from './icon-registry.context.js';
 export * from './icon.registry.js';
 export * from './types.js';
-export * from './icon-picker-modal/index.js';
+export type * from './extensions/icons.extension.js';