@umbraco-cms/backoffice 17.1.0 → 17.2.0-rc

package/dist-cms/packages/templating/templates/tree/manifests.js

@@ -1,5 +1,6 @@
 import { UMB_TEMPLATE_ENTITY_TYPE, UMB_TEMPLATE_ROOT_ENTITY_TYPE } from '../entity.js';
 import { manifests as reloadTreeItemChildrenManifest } from './reload-tree-item-children/manifests.js';
+import { UmbTemplateTreeStore } from './template-tree.store.js';
 export const UMB_TEMPLATE_TREE_REPOSITORY_ALIAS = 'Umb.Repository.Template.Tree';
 /**
  * @deprecated Use {@link UMB_TEMPLATE_TREE_REPOSITORY_ALIAS} instead. This will be removed in Umbraco 18.
@@ -17,7 +18,7 @@ export const manifests = [
         type: 'treeStore',
         alias: UMB_TEMPLATE_TREE_STORE_ALIAS,
         name: 'Template Tree Store',
-        api: () => import('./template-tree.store.js'),
+        api: UmbTemplateTreeStore,
     },
     {
         type: 'tree',

package/dist-cms/packages/templating/templates/workspace/template-workspace-editor.element.js

@@ -15,6 +15,11 @@ import { UMB_MODAL_MANAGER_CONTEXT } from '../../../core/modal/index.js';
 import { umbBindToValidation } from '../../../core/validation/index.js';
 import '../../../code-editor/index.js';
 import '../../local-components/insert-menu/index.js';
+/**
+ * Template alias pattern - allows first character to be a letter, digit, or underscore.
+ * Mirrors server-side CleanStringType.UnderscoreAlias behavior.
+ */
+const UMB_TEMPLATE_ALIAS_PATTERN = '^[A-Za-z0-9_][A-Za-z0-9_-]{0,254}$';
 let UmbTemplateWorkspaceEditorElement = class UmbTemplateWorkspaceEditorElement extends UmbLitElement {
     #modalContext;
     #templateWorkspaceContext;
@@ -139,6 +144,7 @@ let UmbTemplateWorkspaceEditorElement = class UmbTemplateWorkspaceEditorElement
 					placeholder=${this.localize.term('placeholders_entername')}
 					.value=${this._name}
 					.alias=${this._alias}
+					alias-pattern=${UMB_TEMPLATE_ALIAS_PATTERN}
 					?auto-generate-alias=${this.#isNew}
 					@change=${this.#onNameAndAliasChange}
 					required

package/dist-cms/packages/templating/umbraco-package.d.ts

@@ -1,7 +1,8 @@
+import * as entryPointModule from './entry-point.js';
 export declare const name = "Umbraco.Core.Templating";
 export declare const extensions: {
     name: string;
     alias: string;
     type: string;
-    js: () => Promise<typeof import("./entry-point.js")>;
+    js: typeof entryPointModule;
 }[];

package/dist-cms/packages/templating/umbraco-package.js

@@ -1,3 +1,4 @@
+import * as entryPointModule from './entry-point.js';
 export const name = 'Umbraco.Core.Templating';
 export const extensions = [
     {
@@ -10,6 +11,6 @@ export const extensions = [
         name: 'Template Management Backoffice Entry Point',
         alias: 'Umb.BackofficeEntryPoint.TemplateManagement',
         type: 'backofficeEntryPoint',
-        js: () => import('./entry-point.js'),
+        js: entryPointModule,
     },
 ];

package/dist-cms/packages/tiptap/components/input-tiptap/input-tiptap.element.d.ts

@@ -21,7 +21,7 @@ export declare class UmbInputTiptapElement extends UmbInputTiptapElement_base {
     readonly: boolean;
     private _editor?;
     private readonly _extensions;
-    private _styles;
+    private _extensionStyles?;
     private _toolbar;
     private _statusbar;
     constructor();

package/dist-cms/packages/tiptap/components/input-tiptap/input-tiptap.element.js

@@ -22,6 +22,8 @@ const TIPTAP_CORE_EXTENSION_ALIAS = 'Umb.Tiptap.RichTextEssentials';
 const DEFAULT_STYLESHEET_ROOT_PATH = '/css';
 let UmbInputTiptapElement = class UmbInputTiptapElement extends UmbFormControlMixin(UmbLitElement) {
     #context;
+    #hasToolbar;
+    #hasStatusbar;
     #stylesheets;
     #stylesheetRootPath;
     set value(value) {
@@ -40,6 +42,8 @@ let UmbInputTiptapElement = class UmbInputTiptapElement extends UmbFormControlMi
     constructor() {
         super();
         this.#context = new UmbTiptapRteContext(this);
+        this.#hasToolbar = false;
+        this.#hasStatusbar = false;
         this.#stylesheets = new Set(['/umbraco/backoffice/css/rte-content.css']);
         this.#stylesheetRootPath = DEFAULT_STYLESHEET_ROOT_PATH;
         this.#value = '';
@@ -48,7 +52,6 @@ let UmbInputTiptapElement = class UmbInputTiptapElement extends UmbFormControlMi
          */
         this.readonly = false;
         this._extensions = [];
-        this._styles = [];
         this._toolbar = [[[]]];
         this._statusbar = [[], []];
         this.addValidator('valueMissing', () => this.requiredMessage ?? 'Value is required', () => !!this.required && this.isEmpty());
@@ -108,9 +111,8 @@ let UmbInputTiptapElement = class UmbInputTiptapElement extends UmbFormControlMi
                 this.#stylesheets.add(linkHref);
             });
         }
-        this._toolbar = this.configuration?.getValueByAlias('toolbar') ?? [[[]]];
-        this._statusbar = this.configuration?.getValueByAlias('statusbar') ?? [];
         const tiptapExtensions = new Map();
+        const collectedStyles = [];
         this._extensions.forEach((ext) => {
             const tiptapExt = ext.getTiptapExtensions({ configuration: this.configuration });
             if (tiptapExt?.length) {
@@ -122,9 +124,16 @@ let UmbInputTiptapElement = class UmbInputTiptapElement extends UmbFormControlMi
             }
             const styles = ext.getStyles();
             if (styles) {
-                this._styles.push(styles);
+                collectedStyles.push(styles);
             }
         });
+        if (collectedStyles.length) {
+            this._extensionStyles = unsafeCSS(collectedStyles.map((s) => s.toString()).join(''));
+        }
+        this._toolbar = this.configuration?.getValueByAlias('toolbar') ?? [[[]]];
+        this._statusbar = this.configuration?.getValueByAlias('statusbar') ?? [];
+        this.#hasToolbar = this._toolbar.flat(2).length > 0;
+        this.#hasStatusbar = this._statusbar.flat().length > 0;
         this._editor = new Editor({
             element: element,
             editable: !this.readonly,
@@ -162,17 +171,17 @@ let UmbInputTiptapElement = class UmbInputTiptapElement extends UmbFormControlMi
 		`;
     }
     #renderStyles() {
-        if (!this._styles?.length)
+        if (!this._extensionStyles)
             return;
         return html `
 			${repeat(this.#stylesheets, (stylesheet) => stylesheet, (stylesheet) => html `<link rel="stylesheet" href=${stylesheet} />`)}
 			<style>
-				${this._styles.map((style) => unsafeCSS(style))}
+				${this._extensionStyles}
 			</style>
 		`;
     }
     #renderToolbar() {
-        if (!this._toolbar.flat(2).length)
+        if (!this.#hasToolbar)
             return;
         return html `
 			<umb-tiptap-toolbar
@@ -185,7 +194,7 @@ let UmbInputTiptapElement = class UmbInputTiptapElement extends UmbFormControlMi
 		`;
     }
     #renderStatusbar() {
-        if (!this._statusbar.flat().length)
+        if (!this.#hasStatusbar)
             return;
         return html `
 			<umb-tiptap-statusbar
@@ -331,7 +340,7 @@ __decorate([
 ], UmbInputTiptapElement.prototype, "_extensions", void 0);
 __decorate([
     state()
-], UmbInputTiptapElement.prototype, "_styles", void 0);
+], UmbInputTiptapElement.prototype, "_extensionStyles", void 0);
 __decorate([
     state()
 ], UmbInputTiptapElement.prototype, "_toolbar", void 0);

package/dist-cms/packages/tiptap/extensions/block/block.tiptap-api.js

@@ -1,33 +1,35 @@
 import { UmbTiptapExtensionApiBase } from '../tiptap-extension-api-base.js';
 import { umbRteBlock, umbRteBlockInline } from './block.tiptap-extension.js';
-import { distinctUntilChanged } from '../../../../external/rxjs/index.js';
 import { UMB_BLOCK_RTE_DATA_CONTENT_KEY } from '../../../rte/index.js';
 import { UMB_BLOCK_RTE_MANAGER_CONTEXT } from '../../../block/block-rte/index.js';
 export default class UmbTiptapBlockElementApi extends UmbTiptapExtensionApiBase {
+    #blockTypes;
     constructor(host) {
         super(host);
         this.consumeContext(UMB_BLOCK_RTE_MANAGER_CONTEXT, (context) => {
-            this.observe(context?.contents.pipe(distinctUntilChanged((prev, curr) => prev.map((y) => y.key).join() === curr.map((y) => y.key).join())), (contents) => {
-                if (!contents || !context) {
-                    return;
-                }
-                this.#updateBlocks(contents, context.getLayouts());
-            }, 'contents');
+            if (!context)
+                return;
+            this.observe(context.blockTypes, (blockTypes) => {
+                this.#blockTypes = new Map(blockTypes.map((x) => [x.contentElementTypeKey, x]));
+            }, '_observeBlockTypes');
+            this.observe(context.contents, (contents) => {
+                this.#updateBlocks(contents);
+            }, '_observeContents');
         });
     }
     getTiptapExtensions() {
         return [umbRteBlock, umbRteBlockInline];
     }
-    #updateBlocks(blocks, layouts) {
+    #updateBlocks(contents) {
         const editor = this._editor;
         if (!editor)
             return;
+        if (!contents?.length)
+            return;
         const existingBlocks = Array.from(editor.view.dom.querySelectorAll('umb-rte-block, umb-rte-block-inline')).map((x) => x.getAttribute(UMB_BLOCK_RTE_DATA_CONTENT_KEY));
-        const newBlocks = blocks.filter((x) => !existingBlocks.find((contentKey) => contentKey === x.key));
+        const newBlocks = contents.filter((x) => !existingBlocks.find((contentKey) => contentKey === x.key));
         newBlocks.forEach((block) => {
-            // Find layout for block
-            const layout = layouts.find((x) => x.contentKey === block.key);
-            const inline = layout?.displayInline ?? false;
+            const inline = this.#blockTypes?.get(block.contentTypeKey)?.displayInline ?? false;
             if (inline) {
                 editor.commands.setBlockInline({ contentKey: block.key });
             }

package/dist-cms/packages/tiptap/extensions/block/block.tiptap-extension.js

@@ -40,23 +40,12 @@ export const umbRteBlockInline = umbRteBlock.extend({
     parseHTML() {
         return [{ tag: `umb-rte-block-inline[${UMB_BLOCK_RTE_DATA_CONTENT_KEY}]` }];
     },
-    // TODO: [v17] Remove the `@ts-expect-error` once Tiptap has resolved the TypeScript definitions. [LK:2025-10-01]
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-expect-error
     renderHTML({ HTMLAttributes }) {
         return ['umb-rte-block-inline', HTMLAttributes];
     },
     addCommands() {
         return {
-            setBlockInline: 
-            // TODO: [v17] Remove the `@ts-expect-error` once Tiptap has resolved the TypeScript definitions. [LK:2025-10-01]
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-expect-error
-            (options) => 
-            // TODO: [v17] Remove the `@ts-expect-error` once Tiptap has resolved the TypeScript definitions. [LK:2025-10-01]
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-expect-error
-            ({ commands }) => {
+            setBlockInline: (options) => ({ commands }) => {
                 const attrs = { [UMB_BLOCK_RTE_DATA_CONTENT_KEY]: options.contentKey };
                 return commands.insertContent({
                     type: this.name,

package/dist-cms/packages/tiptap/extensions/heading/heading6.tiptap-toolbar-api.d.ts

@@ -1,6 +1,6 @@
 import type { Editor } from '../../externals.js';
 import { UmbTiptapToolbarElementApiBase } from '../tiptap-toolbar-element-api-base.js';
-export default class UmbTiptapToolbarHeading3ExtensionApi extends UmbTiptapToolbarElementApiBase {
+export default class UmbTiptapToolbarHeading6ExtensionApi extends UmbTiptapToolbarElementApiBase {
     isActive(editor?: Editor): boolean;
     execute(editor?: Editor): void;
 }

package/dist-cms/packages/tiptap/extensions/heading/heading6.tiptap-toolbar-api.js

@@ -1,5 +1,5 @@
 import { UmbTiptapToolbarElementApiBase } from '../tiptap-toolbar-element-api-base.js';
-export default class UmbTiptapToolbarHeading3ExtensionApi extends UmbTiptapToolbarElementApiBase {
+export default class UmbTiptapToolbarHeading6ExtensionApi extends UmbTiptapToolbarElementApiBase {
     isActive(editor) {
         return editor?.isActive('heading', { level: 6 }) === true;
     }

package/dist-cms/packages/tiptap/extensions/html-attr-class/html-attr-class.tiptap-extension.js

@@ -26,8 +26,32 @@ export const HtmlClassAttribute = Extension.create({
                 if (!className)
                     return false;
                 const types = type ? [type] : this.options.types;
-                const existing = types.map((type) => editor.getAttributes(type)?.class).filter((x) => x);
-                return existing.length ? commands.unsetClassName(type) : commands.setClassName(className, type);
+                const toggleClasses = className.split(/\s+/).filter((c) => c);
+                if (toggleClasses.length === 0) {
+                    return true;
+                }
+                return types
+                    .map((t) => {
+                    const existingClass = editor.getAttributes(t)?.class ?? '';
+                    const classes = existingClass.split(/\s+/).filter((c) => c);
+                    const hasAllToggleClasses = toggleClasses.every((c) => classes.includes(c));
+                    let newClasses;
+                    if (hasAllToggleClasses) {
+                        // All toggle classes present: remove them
+                        newClasses = classes.filter((c) => !toggleClasses.includes(c));
+                    }
+                    else {
+                        // Not all toggle classes present: add missing ones
+                        const toAdd = toggleClasses.filter((c) => !classes.includes(c));
+                        newClasses = [...classes, ...toAdd];
+                    }
+                    if (newClasses.length === 0) {
+                        // No classes left, remove the attribute entirely
+                        return commands.resetAttributes(t, 'class');
+                    }
+                    return commands.updateAttributes(t, { class: newClasses.join(' ') });
+                })
+                    .every((response) => response);
             },
             unsetClassName: (type) => ({ commands }) => {
                 const types = type ? [type] : this.options.types;

package/dist-cms/packages/tiptap/extensions/link/link.tiptap-extension.d.ts

@@ -2,6 +2,13 @@ export declare const UmbLink: import("@tiptap/core").Mark<import("@tiptap/extens
 declare module '@tiptap/core' {
     interface Commands<ReturnType> {
         umbLink: {
+            ensureUmbLink: (attributes: {
+                type: string;
+                href: string;
+                'data-anchor'?: string | null;
+                target?: string | null;
+                title?: string | null;
+            }) => ReturnType;
             setUmbLink: (attributes: {
                 type: string;
                 href: string;

package/dist-cms/packages/tiptap/extensions/link/link.tiptap-extension.js

@@ -1,24 +1,22 @@
 import { Link } from '../../externals.js';
+// TODO: [LK] Look to use a NodeView to render the link, so that we remove the `data-router-slot` attribute from the HTML value.
+// https://tiptap.dev/docs/editor/extensions/custom-extensions/node-views/javascript
 export const UmbLink = Link.extend({
     name: 'umbLink',
     addAttributes() {
         return {
-            // TODO: [v17] Remove the `@ts-expect-error` once Tiptap has resolved the TypeScript definitions. [LK:2025-10-01]
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-expect-error
             ...this.parent?.(),
             'data-anchor': { default: null },
             title: { default: null },
             type: { default: 'external' },
         };
     },
-    // TODO: [LK] Look to use a NodeView to render the link
-    // https://tiptap.dev/docs/editor/extensions/custom-extensions/node-views/javascript
+    // TODO: [LK] Review why `addOptions()` is not typed correctly here.
+    // ref: https://github.com/ueberdosis/tiptap/issues/6670
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-expect-error
     addOptions() {
         return {
-            // TODO: [v17] Remove the `@ts-expect-error` once Tiptap has resolved the TypeScript definitions. [LK:2025-10-01]
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-expect-error
             ...this.parent?.(),
             HTMLAttributes: {
                 target: '',
@@ -28,21 +26,20 @@ export const UmbLink = Link.extend({
     },
     addCommands() {
         return {
-            // TODO: [v17] Remove the `@ts-expect-error` once Tiptap has resolved the TypeScript definitions. [LK:2025-10-01]
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-expect-error
+            ensureUmbLink: (attributes) => {
+                return ({ editor, chain }) => {
+                    if (editor.isActive(this.name)) {
+                        return true;
+                    }
+                    return chain().setMark(this.name, attributes).setMeta('preventAutolink', true).run();
+                };
+            },
             setUmbLink: (attributes) => {
-                // TODO: [v17] Remove the `@ts-expect-error` once Tiptap has resolved the TypeScript definitions. [LK:2025-10-01]
-                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                // @ts-expect-error
                 return ({ chain }) => {
                     return chain().setMark(this.name, attributes).setMeta('preventAutolink', true).run();
                 };
             },
             unsetUmbLink: () => {
-                // TODO: [v17] Remove the `@ts-expect-error` once Tiptap has resolved the TypeScript definitions. [LK:2025-10-01]
-                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                // @ts-expect-error
                 return ({ chain }) => {
                     return chain().unsetMark(this.name, { extendEmptyMarkRange: true }).setMeta('preventAutolink', true).run();
                 };

package/dist-cms/packages/tiptap/extensions/style-menu/style-menu.tiptap-toolbar-api.js

@@ -15,6 +15,7 @@ export default class UmbTiptapToolbarStyleMenuApi extends UmbTiptapToolbarElemen
         h5: this.#headingCommand(5),
         h6: this.#headingCommand(6),
         p: { type: 'paragraph', command: (chain) => chain.setParagraph() },
+        a: { type: 'umbLink', command: (chain) => chain.ensureUmbLink({ type: 'external', href: '#' }) },
         blockquote: { type: 'blockquote', command: (chain) => chain.toggleBlockquote() },
         code: { type: 'code', command: (chain) => chain.toggleCode() },
         codeBlock: { type: 'codeBlock', command: (chain) => chain.toggleCodeBlock() },

package/dist-cms/packages/tiptap/extensions/subscript/subscript.tiptap-api.d.ts

@@ -1,4 +1,4 @@
 import { UmbTiptapExtensionApiBase } from '../tiptap-extension-api-base.js';
-export default class UmbTiptapBoldExtensionApi extends UmbTiptapExtensionApiBase {
+export default class UmbTiptapSubscriptExtensionApi extends UmbTiptapExtensionApiBase {
     getTiptapExtensions: () => import("@tiptap/core").Mark<import("@tiptap/extension-subscript").SubscriptExtensionOptions, any>[];
 }

package/dist-cms/packages/tiptap/extensions/subscript/subscript.tiptap-api.js

@@ -1,6 +1,6 @@
 import { UmbTiptapExtensionApiBase } from '../tiptap-extension-api-base.js';
 import { Subscript } from '../../externals.js';
-export default class UmbTiptapBoldExtensionApi extends UmbTiptapExtensionApiBase {
+export default class UmbTiptapSubscriptExtensionApi extends UmbTiptapExtensionApiBase {
     constructor() {
         super(...arguments);
         this.getTiptapExtensions = () => [Subscript];

package/dist-cms/packages/tiptap/extensions/superscript/superscript.tiptap-api.d.ts

@@ -1,4 +1,4 @@
 import { UmbTiptapExtensionApiBase } from '../tiptap-extension-api-base.js';
-export default class UmbTiptapBoldExtensionApi extends UmbTiptapExtensionApiBase {
+export default class UmbTiptapSuperscriptExtensionApi extends UmbTiptapExtensionApiBase {
     getTiptapExtensions: () => import("@tiptap/core").Mark<import("@tiptap/extension-superscript").SuperscriptExtensionOptions, any>[];
 }

package/dist-cms/packages/tiptap/extensions/superscript/superscript.tiptap-api.js

@@ -1,6 +1,6 @@
 import { UmbTiptapExtensionApiBase } from '../tiptap-extension-api-base.js';
 import { Superscript } from '../../externals.js';
-export default class UmbTiptapBoldExtensionApi extends UmbTiptapExtensionApiBase {
+export default class UmbTiptapSuperscriptExtensionApi extends UmbTiptapExtensionApiBase {
     constructor() {
         super(...arguments);
         this.getTiptapExtensions = () => [Superscript];

package/dist-cms/packages/tiptap/extensions/text-direction/text-direction.tiptap-api.d.ts

@@ -1,4 +1,5 @@
 import { UmbTiptapExtensionApiBase } from '../tiptap-extension-api-base.js';
+/** @deprecated No longer required, (since it comes default with Tiptap). This will be removed in Umbraco 19. [LK] */
 export default class UmbTiptapTextDirectionExtensionApi extends UmbTiptapExtensionApiBase {
-    getTiptapExtensions: () => import("@tiptap/core").Extension<import("./text-direction.tiptap-extension.js").UmbTiptapTextDirectionOptions, any>[];
+    getTiptapExtensions: () => never[];
 }

package/dist-cms/packages/tiptap/extensions/text-direction/text-direction.tiptap-api.js

@@ -1,12 +1,10 @@
 import { UmbTiptapExtensionApiBase } from '../tiptap-extension-api-base.js';
-import { TextDirection } from './text-direction.tiptap-extension.js';
+/** @deprecated No longer required, (since it comes default with Tiptap). This will be removed in Umbraco 19. [LK] */
 export default class UmbTiptapTextDirectionExtensionApi extends UmbTiptapExtensionApiBase {
     constructor() {
         super(...arguments);
-        this.getTiptapExtensions = () => [
-            TextDirection.configure({
-                types: ['heading', 'paragraph', 'blockquote', 'orderedList', 'bulletList'],
-            }),
-        ];
+        // NOTE: `TextDirection` is now bundled with Tiptap since v3.11.0. [LK]
+        // https://github.com/ueberdosis/tiptap/pull/7207
+        this.getTiptapExtensions = () => [];
     }
 }

package/dist-cms/packages/tiptap/extensions/text-direction/text-direction.tiptap-extension.d.ts

@@ -1,14 +1,7 @@
-import { Extension } from '../../externals.js';
+/** @deprecated No longer used internally. This will be removed in Umbraco 19. [LK] */
 export interface UmbTiptapTextDirectionOptions {
     directions: Array<'auto' | 'ltr' | 'rtl'>;
     types: Array<string>;
 }
-export declare const TextDirection: Extension<UmbTiptapTextDirectionOptions, any>;
-declare module '@tiptap/core' {
-    interface Commands<ReturnType> {
-        textDirection: {
-            setTextDirection: (direction: 'auto' | 'ltr' | 'rtl') => ReturnType;
-            unsetTextDirection: () => ReturnType;
-        };
-    }
-}
+/** @deprecated No longer required, (since it comes default with Tiptap). This will be removed in Umbraco 19. [LK] */
+export declare const TextDirection: import("@tiptap/core").Extension<UmbTiptapTextDirectionOptions, any>;

package/dist-cms/packages/tiptap/extensions/text-direction/text-direction.tiptap-extension.js

@@ -1,35 +1,6 @@
-import { Extension } from '../../externals.js';
-export const TextDirection = Extension.create({
-    name: 'textDirection',
-    addOptions() {
-        return {
-            directions: ['ltr', 'rtl', 'auto'],
-            types: ['heading', 'paragraph'],
-        };
-    },
-    addGlobalAttributes() {
-        return [
-            {
-                types: this.options.types,
-                attributes: {
-                    textDirection: {
-                        parseHTML: (element) => element.dir,
-                        renderHTML: (attributes) => this.options.directions.includes(attributes.textDirection) ? { dir: attributes.textDirection } : null,
-                    },
-                },
-            },
-        ];
-    },
-    addCommands() {
-        return {
-            setTextDirection: (direction) => ({ commands }) => {
-                return this.options.directions.includes(direction)
-                    ? this.options.types.every((type) => commands.updateAttributes(type, { textDirection: direction }))
-                    : false;
-            },
-            unsetTextDirection: () => ({ commands }) => {
-                return this.options.types.every((type) => commands.resetAttributes(type, 'textDirection'));
-            },
-        };
-    },
-});
+// NOTE: `TextDirection` is now bundled with Tiptap since v3.11.0. [LK]
+// https://github.com/ueberdosis/tiptap/pull/7207
+// eslint-disable-next-line local-rules/enforce-umbraco-external-imports
+import { extensions as TiptapExtensions } from '@tiptap/core';
+/** @deprecated No longer required, (since it comes default with Tiptap). This will be removed in Umbraco 19. [LK] */
+export const TextDirection = TiptapExtensions.TextDirection.extend();

package/dist-cms/packages/tiptap/externals.js

@@ -1,7 +1,4 @@
-// Work-in-progress upgrade to Tiptap v3. [LK]
-// Watch this issue: https://github.com/ueberdosis/tiptap/issues/6670
-//
-// Docs:
+// Tiptap v3 Docs:
 // https://tiptap.dev/docs/guides/upgrade-tiptap-v2
 // https://tiptap.dev/docs/resources/whats-new
 // https://github.com/ueberdosis/tiptap/issues

package/dist-cms/packages/tiptap/package.json

@@ -6,15 +6,15 @@
         "build": "vite build"
     },
     "dependencies": {
-        "@tiptap/core": "3.6.2",
-        "@tiptap/extension-image": "3.6.2",
-        "@tiptap/extension-subscript": "3.6.2",
-        "@tiptap/extension-superscript": "3.6.2",
-        "@tiptap/extension-table": "3.6.2",
-        "@tiptap/extension-text-align": "3.6.2",
-        "@tiptap/extension-text-style": "3.6.2",
-        "@tiptap/starter-kit": "3.6.2",
-        "@tiptap/extensions": "3.6.2",
-        "@tiptap/pm": "3.6.2"
+        "@tiptap/core": "3.16.0",
+        "@tiptap/extension-image": "3.16.0",
+        "@tiptap/extension-subscript": "3.16.0",
+        "@tiptap/extension-superscript": "3.16.0",
+        "@tiptap/extension-table": "3.16.0",
+        "@tiptap/extension-text-align": "3.16.0",
+        "@tiptap/extension-text-style": "3.16.0",
+        "@tiptap/starter-kit": "3.16.0",
+        "@tiptap/extensions": "3.16.0",
+        "@tiptap/pm": "3.16.0"
     }
 }

package/dist-cms/packages/ufm/plugins/marked-ufm.plugin.js

@@ -6,12 +6,13 @@ export function ufm(plugins = []) {
     return {
         extensions: plugins.map(({ alias, marker, render }) => {
             const prefix = `(${alias}:${marker ? `|${marker}` : ''})`;
+            const startPattern = new RegExp(`\\{\\s*${prefix}`);
             return {
                 name: alias,
                 level: 'inline',
-                start: (src) => src.search(`{${prefix}`),
+                start: (src) => src.search(startPattern),
                 tokenizer: (src) => {
-                    const pattern = `^\\{${prefix}([^}]*)\\}`;
+                    const pattern = `^\\{\\s*${prefix}([^}]*)\\}`;
                     const regex = new RegExp(pattern);
                     const match = src.match(regex);
                     if (match) {

package/dist-cms/packages/umbraco-news/components/umb-news-card.element.d.ts

@@ -6,7 +6,7 @@ export declare class UmbNewsCardElement extends UmbLitElement {
     item: NewsDashboardItemResponseModel;
     priority: number;
     render(): typeof nothing | import("lit-html").TemplateResult<1>;
-    static styles: import("lit").CSSResult;
+    static styles: import("lit").CSSResult[];
 }
 export default UmbNewsCardElement;
 declare global {