Skip to content

Commit 780b7e8

Browse files
nielslyngsoenielslyngsoe
authored
Merge pull request #2388 from umbraco/v15/feature/split-rte-packages
Split rte/tiny-mce/tiptap packages
2 parents 74308e2 + c52a2ac commit 780b7e8

File tree

121 files changed

+146
-49
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+146
-49
lines changed

‎.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"svgs",
2222
"templating",
2323
"tinymce",
24+
"tiptap",
2425
"umbraco",
2526
"Uncategorized",
2627
"uninitialize",

‎package-lock.json

Lines changed: 12 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
"./content-type": "./dist-cms/packages/core/content-type/index.js",
3131
"./content": "./dist-cms/packages/core/content/index.js",
3232
"./culture": "./dist-cms/packages/core/culture/index.js",
33-
"./picker": "./dist-cms/packages/core/picker/index.js",
3433
"./current-user": "./dist-cms/packages/user/current-user/index.js",
3534
"./dashboard": "./dist-cms/packages/core/dashboard/index.js",
3635
"./data-type": "./dist-cms/packages/data-type/index.js",
@@ -68,6 +67,7 @@
6867
"./package": "./dist-cms/packages/packages/package/index.js",
6968
"./partial-view": "./dist-cms/packages/templating/partial-views/index.js",
7069
"./picker-input": "./dist-cms/packages/core/picker-input/index.js",
70+
"./picker": "./dist-cms/packages/core/picker/index.js",
7171
"./property-action": "./dist-cms/packages/core/property-action/index.js",
7272
"./property-editor": "./dist-cms/packages/core/property-editor/index.js",
7373
"./property-type": "./dist-cms/packages/core/property-type/index.js",
@@ -78,6 +78,7 @@
7878
"./repository": "./dist-cms/packages/core/repository/index.js",
7979
"./resources": "./dist-cms/packages/core/resources/index.js",
8080
"./router": "./dist-cms/packages/core/router/index.js",
81+
"./rte": "./dist-cms/packages/rte/index.js",
8182
"./script": "./dist-cms/packages/templating/scripts/index.js",
8283
"./search": "./dist-cms/packages/search/index.js",
8384
"./section": "./dist-cms/packages/core/section/index.js",
@@ -93,8 +94,8 @@
9394
"./template": "./dist-cms/packages/templating/templates/index.js",
9495
"./temporary-file": "./dist-cms/packages/core/temporary-file/index.js",
9596
"./themes": "./dist-cms/packages/core/themes/index.js",
96-
"./tiny-mce": "./dist-cms/packages/rte/tiny-mce/index.js",
97-
"./tiptap": "./dist-cms/packages/rte/tiptap/index.js",
97+
"./tiny-mce": "./dist-cms/packages/tiny-mce/index.js",
98+
"./tiptap": "./dist-cms/packages/tiptap/index.js",
9899
"./translation": "./dist-cms/packages/translation/index.js",
99100
"./tree": "./dist-cms/packages/core/tree/index.js",
100101
"./ufm": "./dist-cms/packages/ufm/index.js",

‎src/apps/backoffice/backoffice.element.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ const CORE_PACKAGES = [
4141
import('../../packages/tags/umbraco-package.js'),
4242
import('../../packages/telemetry/umbraco-package.js'),
4343
import('../../packages/templating/umbraco-package.js'),
44+
import('../../packages/tiny-mce/umbraco-package.js'),
45+
import('../../packages/tiptap/umbraco-package.js'),
4446
import('../../packages/translation/umbraco-package.js'),
4547
import('../../packages/ufm/umbraco-package.js'),
4648
import('../../packages/umbraco-news/umbraco-package.js'),

‎src/json-schema/all-packages.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import '@umbraco-cms/backoffice/class-api';
33
import '@umbraco-cms/backoffice/context-api';
44
import '@umbraco-cms/backoffice/controller-api';
55
import '@umbraco-cms/backoffice/element-api';
6+
import '@umbraco-cms/backoffice/embedded-media';
67
import '@umbraco-cms/backoffice/extension-api';
78
import '@umbraco-cms/backoffice/formatting-api';
89
import '@umbraco-cms/backoffice/localization-api';
@@ -22,8 +23,8 @@ import '@umbraco-cms/backoffice/components';
2223
import '@umbraco-cms/backoffice/content-type';
2324
import '@umbraco-cms/backoffice/content';
2425
import '@umbraco-cms/backoffice/culture';
25-
import '@umbraco-cms/backoffice/picker';
2626
import '@umbraco-cms/backoffice/current-user';
27+
import '@umbraco-cms/backoffice/dashboard';
2728
import '@umbraco-cms/backoffice/data-type';
2829
import '@umbraco-cms/backoffice/debug';
2930
import '@umbraco-cms/backoffice/dictionary';
@@ -35,6 +36,7 @@ import '@umbraco-cms/backoffice/entity-bulk-action';
3536
import '@umbraco-cms/backoffice/entity';
3637
import '@umbraco-cms/backoffice/event';
3738
import '@umbraco-cms/backoffice/extension-registry';
39+
import '@umbraco-cms/backoffice/health-check';
3840
import '@umbraco-cms/backoffice/help';
3941
import '@umbraco-cms/backoffice/icon';
4042
import '@umbraco-cms/backoffice/id';
@@ -57,6 +59,7 @@ import '@umbraco-cms/backoffice/object-type';
5759
import '@umbraco-cms/backoffice/package';
5860
import '@umbraco-cms/backoffice/partial-view';
5961
import '@umbraco-cms/backoffice/picker-input';
62+
import '@umbraco-cms/backoffice/picker';
6063
import '@umbraco-cms/backoffice/property-action';
6164
import '@umbraco-cms/backoffice/property-editor';
6265
import '@umbraco-cms/backoffice/property-type';
@@ -67,6 +70,7 @@ import '@umbraco-cms/backoffice/relations';
6770
import '@umbraco-cms/backoffice/repository';
6871
import '@umbraco-cms/backoffice/resources';
6972
import '@umbraco-cms/backoffice/router';
73+
import '@umbraco-cms/backoffice/rte';
7074
import '@umbraco-cms/backoffice/script';
7175
import '@umbraco-cms/backoffice/search';
7276
import '@umbraco-cms/backoffice/section';
@@ -83,8 +87,11 @@ import '@umbraco-cms/backoffice/template';
8387
import '@umbraco-cms/backoffice/temporary-file';
8488
import '@umbraco-cms/backoffice/themes';
8589
import '@umbraco-cms/backoffice/tiny-mce';
90+
import '@umbraco-cms/backoffice/tiptap';
91+
import '@umbraco-cms/backoffice/translation';
8692
import '@umbraco-cms/backoffice/tree';
8793
import '@umbraco-cms/backoffice/ufm';
94+
import '@umbraco-cms/backoffice/user-change-password';
8895
import '@umbraco-cms/backoffice/user-group';
8996
import '@umbraco-cms/backoffice/user-permission';
9097
import '@umbraco-cms/backoffice/user';
@@ -104,5 +111,6 @@ import '@umbraco-cms/backoffice/external/openid';
104111
import '@umbraco-cms/backoffice/external/router-slot';
105112
import '@umbraco-cms/backoffice/external/rxjs';
106113
import '@umbraco-cms/backoffice/external/tinymce';
114+
import '@umbraco-cms/backoffice/external/tiptap';
107115
import '@umbraco-cms/backoffice/external/uui';
108116
import '@umbraco-cms/backoffice/external/uuid';

‎src/packages/rte/components/rte-base.element.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { type UmbPropertyEditorUiValueType, UMB_BLOCK_RTE_PROPERTY_EDITOR_SCHEMA_ALIAS } from '../types.js';
1+
import type { UmbPropertyEditorUiValueType } from '../types.js';
2+
import { UMB_BLOCK_RTE_PROPERTY_EDITOR_SCHEMA_ALIAS } from '../constants.js';
23
import { property, state } from '@umbraco-cms/backoffice/external/lit';
34
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
45
import { UmbPropertyValueChangeEvent } from '@umbraco-cms/backoffice/property-editor';
@@ -13,7 +14,8 @@ import {
1314
} from '@umbraco-cms/backoffice/block-rte';
1415
import { UMB_PROPERTY_CONTEXT, UMB_PROPERTY_DATASET_CONTEXT } from '@umbraco-cms/backoffice/property';
1516

16-
export abstract class UmbRteBaseElement extends UmbLitElement implements UmbPropertyEditorUiElement {
17+
// eslint-disable-next-line local-rules/enforce-element-suffix-on-element-class-name
18+
export abstract class UmbPropertyEditorUiRteElementBase extends UmbLitElement implements UmbPropertyEditorUiElement {
1719
public set config(config: UmbPropertyEditorConfigCollection | undefined) {
1820
if (!config) return;
1921

‎src/packages/rte/constants.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
export const UMB_BLOCK_RTE_PROPERTY_EDITOR_SCHEMA_ALIAS = 'Umbraco.RichText';
2+
3+
/**
4+
* The attribute where the block content key is stored.
5+
*/
6+
export const UMB_BLOCK_RTE_DATA_CONTENT_KEY = 'data-content-key';

‎src/packages/rte/index.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export * from './components/rte-base.element.js';
2+
export * from './constants.js';
3+
export type * from './types.js';

‎src/packages/rte/manifests.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
1-
// eslint-disable-next-line local-rules/no-relative-import-to-import-map-module
2-
import { manifests as tiptapManifests } from './tiptap/manifests.js';
3-
import { manifests as tinyMceManifests } from './tiny-mce/manifests.js';
41
import { manifest as schemaManifest } from './Umbraco.RichText.js';
52
import { manifest as blockRtePropertyValueResolver } from './property-value-resolver/manifest.js';
6-
import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
3+
import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
74

8-
export const manifests: Array<ManifestTypes | UmbExtensionManifestKind> = [
9-
...tinyMceManifests,
10-
...tiptapManifests,
5+
export const manifests: Array<UmbExtensionManifest | UmbExtensionManifestKind> = [
116
schemaManifest,
127
blockRtePropertyValueResolver,
138
];

‎src/packages/rte/property-value-resolver/manifest.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { UMB_BLOCK_RTE_PROPERTY_EDITOR_SCHEMA_ALIAS } from '../types.js';
1+
import { UMB_BLOCK_RTE_PROPERTY_EDITOR_SCHEMA_ALIAS } from '../constants.js';
22
import { UmbRteBlockValueResolver } from './rte-block-value-resolver.api.js';
33
import type { ManifestPropertyValueResolver } from '@umbraco-cms/backoffice/property';
44

0 commit comments

Comments
 (0)