Skip to content

Commit 6cb8467

Browse files
authored
Merge pull request #2372 from umbraco/v15/feature/emm-tiny-mce-plugin
Extension Manifest Map: Tiny MCE Plugin
2 parents a821dfd + 7ef0020 commit 6cb8467

File tree

6 files changed

+11
-5
lines changed

6 files changed

+11
-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
@@ -3,7 +3,6 @@ import type { ManifestCurrentUserAction, ManifestCurrentUserActionDefaultKind }
33
import type { ManifestDynamicRootOrigin, ManifestDynamicRootQueryStep } from './dynamic-root.model.js';
44
import type { ManifestFileUploadPreview } from './file-upload-preview.model.js';
55
import type { ManifestExternalLoginProvider } from './external-login-provider.model.js';
6-
import type { ManifestTinyMcePlugin } from './tinymce-plugin.model.js';
76
import type { ManifestUfmComponent } from './ufm-component.model.js';
87
import type { ManifestUfmFilter } from './ufm-filter.model.js';
98
import type { ManifestUserProfileApp } from './user-profile-app.model.js';
@@ -16,7 +15,6 @@ export type * from './dynamic-root.model.js';
1615
export type * from './file-upload-preview.model.js';
1716
export type * from './external-login-provider.model.js';
1817
export type * from './mfa-login-provider.model.js';
19-
export type * from './tinymce-plugin.model.js';
2018
export type * from './ufm-component.model.js';
2119
export type * from './ufm-filter.model.js';
2220
export type * from './user-profile-app.model.js';
@@ -32,7 +30,6 @@ export type ManifestTypes =
3230
| ManifestFileUploadPreview
3331
| ManifestExternalLoginProvider
3432
| ManifestMfaLoginProvider
35-
| ManifestTinyMcePlugin
3633
| ManifestUfmComponent
3734
| ManifestUfmFilter
3835
| ManifestUserProfileApp

src/packages/tiny-mce/components/input-tiny-mce/input-tiny-mce.element.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import type { UmbTinyMcePluginBase } from './tiny-mce-plugin.js';
66
import { type ClassConstructor, loadManifestApi } from '@umbraco-cms/backoffice/extension-api';
77
import { css, customElement, html, property, query } from '@umbraco-cms/backoffice/external/lit';
88
import { getProcessedImageUrl, umbDeepMerge } from '@umbraco-cms/backoffice/utils';
9-
import { type ManifestTinyMcePlugin, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
9+
import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
1010
import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
1111
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
1212
import { UmbStylesheetDetailRepository, UmbStylesheetRuleManager } from '@umbraco-cms/backoffice/stylesheet';
@@ -18,6 +18,7 @@ import {
1818
renderEditor,
1919
} from '@umbraco-cms/backoffice/external/tinymce';
2020
import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
21+
import type { ManifestTinyMcePlugin } from '@umbraco-cms/backoffice/tiny-mce';
2122

2223
/**
2324
* Handles the resize event

src/packages/tiny-mce/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
export * from './components/index.js';
22
export * from './modals/index.js';
3+
export * from './plugins/index.js';
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from './tinymce-plugin.extension.js';

src/packages/tiny-mce/plugins/manifests.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { ManifestTinyMcePlugin } from '@umbraco-cms/backoffice/extension-registry';
1+
import type { ManifestTinyMcePlugin } from './tinymce-plugin.extension.js';
22

33
export const manifests: Array<ManifestTinyMcePlugin> = [
44
{

src/packages/core/extension-registry/models/tinymce-plugin.model.ts renamed to src/packages/tiny-mce/plugins/tinymce-plugin.extension.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,9 @@ export interface ManifestTinyMcePlugin extends ManifestApi<UmbTinyMcePluginBase>
5353
type: 'tinyMcePlugin';
5454
meta?: MetaTinyMcePlugin;
5555
}
56+
57+
declare global {
58+
interface UmbExtensionManifestMap {
59+
umbTinyMcePlugin: ManifestTinyMcePlugin;
60+
}
61+
}

0 commit comments

Comments
 (0)