Skip to content

Commit 510515b

Browse files
authored
Merge pull request #2361 from umbraco/v15/feature/emm-icons
Extension Manifest Map: icons
2 parents 774eb1f + 923e951 commit 510515b

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

src/packages/core/extension-registry/models/index.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import type { ManifestExternalLoginProvider } from './external-login-provider.mo
2424
import type { ManifestGlobalContext } from './global-context.model.js';
2525
import type { ManifestHeaderApp, ManifestHeaderAppButtonKind } from './header-app.model.js';
2626
import type { ManifestHealthCheck } from './health-check.model.js';
27-
import type { ManifestIcons } from './icons.model.js';
2827
import type { ManifestMenu } from './menu.model.js';
2928
import type { ManifestMenuItem, ManifestMenuItemLinkKind, ManifestMenuItemTreeKind } from './menu-item.model.js';
3029
import type { ManifestPreviewAppProvider } from './preview-app.model.js';
@@ -59,7 +58,6 @@ export type * from './external-login-provider.model.js';
5958
export type * from './global-context.model.js';
6059
export type * from './header-app.model.js';
6160
export type * from './health-check.model.js';
62-
export type * from './icons.model.js';
6361
export type * from './menu-item.model.js';
6462
export type * from './menu.model.js';
6563
export type * from './mfa-login-provider.model.js';
@@ -112,7 +110,6 @@ export type ManifestTypes =
112110
| ManifestHeaderApp
113111
| ManifestHeaderAppButtonKind
114112
| ManifestHealthCheck
115-
| ManifestIcons
116113
| ManifestItemStore
117114
| ManifestMenu
118115
| ManifestMenuItem

src/packages/core/extension-registry/models/icons.model.ts renamed to src/packages/core/icon-registry/extensions/icons.extension.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,9 @@ import type { ManifestPlainJs } from '@umbraco-cms/backoffice/extension-api';
44
export interface ManifestIcons extends ManifestPlainJs<{ default: UmbIconDictionary }> {
55
type: 'icons';
66
}
7+
8+
declare global {
9+
interface UmbExtensionManifestMap {
10+
UmbIconsExtension: ManifestIcons;
11+
}
12+
}

src/packages/core/icon-registry/icon-registry.context.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
55
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
66
import { loadManifestPlainJs } from '@umbraco-cms/backoffice/extension-api';
77
import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api';
8-
import { type ManifestIcons, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
8+
import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
9+
import type { ManifestIcons } from '@umbraco-cms/backoffice/icon';
910

1011
export class UmbIconRegistryContext extends UmbContextBase<UmbIconRegistryContext> {
1112
#registry: UmbIconRegistry;
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
export * from './icon-picker-modal/index.js';
12
export * from './icon-registry.context-token.js';
23
export * from './icon-registry.context.js';
34
export * from './icon.registry.js';
45
export * from './types.js';
5-
export * from './icon-picker-modal/index.js';
6+
export type * from './extensions/icons.extension.js';

0 commit comments

Comments
 (0)