yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into v15/feature/emm-core-types

Browse Source
This commit is contained in:
Mads Rasmussen
2024-09-30 08:46:43 +02:00
parent 1ad04ca13e 08b62002c7
commit 2e58e61620
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts
View File

@@ -5,7 +5,6 @@ import type { ManifestDynamicRootOrigin, ManifestDynamicRootQueryStep } from './
import type { ManifestFileUploadPreview } from './file-upload-preview.model.js';
import type { ManifestExternalLoginProvider } from './external-login-provider.model.js';
import type { ManifestHealthCheck } from './health-check.model.js';
import type { ManifestIcons } from './icons.model.js';
import type { ManifestTinyMcePlugin } from './tinymce-plugin.model.js';
import type { ManifestUfmComponent } from './ufm-component.model.js';
import type { ManifestUfmFilter } from './ufm-filter.model.js';
@@ -29,7 +28,6 @@ export type * from '../extensions/entry-point.extension.js';
export type * from './file-upload-preview.model.js';
export type * from './external-login-provider.model.js';
export type * from './health-check.model.js';
export type * from './icons.model.js';
export type * from '../extensions/menu-item.extension.js';
export type * from '../extensions/menu.extension.js';
export type * from './mfa-login-provider.model.js';
@@ -59,7 +57,6 @@ export type ManifestTypes =
| ManifestExternalLoginProvider
| ManifestGranularUserPermission
| ManifestHealthCheck
| ManifestIcons
| ManifestMfaLoginProvider
| ManifestMonacoMarkdownEditorAction
| ManifestPickerSearchResultItem

6
src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/icons.model.ts → src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/extensions/icons.extension.ts
View File

@@ -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;
}
}

3
src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-registry.context.ts
View File

@@ -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;

3
src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/index.ts
View File

@@ -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';