From 1a6e4add9b22d0bb706d7112e7786e54a5f0fa20 Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Mon, 26 Jun 2023 09:34:14 +0200
Subject: [PATCH] @web/test-runner does not understand commonjs and thus
 tinymce cannot be registered, so we are using an optional ? for tiny just to
 make sure the test does not break

---
 src/Umbraco.Web.UI.Client/src/external/tinymce/index.ts         | 2 +-
 ...property-editor-ui-tiny-mce-toolbar-configuration.element.ts | 2 +-
 .../property-editor-ui-tiny-mce-toolbar-configuration.test.ts   | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/external/tinymce/index.ts b/src/Umbraco.Web.UI.Client/src/external/tinymce/index.ts
index 7c3dc0e831..954413ef1d 100644
--- a/src/Umbraco.Web.UI.Client/src/external/tinymce/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/external/tinymce/index.ts
@@ -31,4 +31,4 @@ export function renderEditor(userConfig?: tiny.RawEditorOptions) {
 	return window.tinymce.init(config);
 }
 
-export * as tinymce from 'tinymce';
+export { tiny as tinymce };
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/toolbar/property-editor-ui-tiny-mce-toolbar-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/toolbar/property-editor-ui-tiny-mce-toolbar-configuration.element.ts
index 8aa3c4a9cb..1ea50f1550 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/toolbar/property-editor-ui-tiny-mce-toolbar-configuration.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/toolbar/property-editor-ui-tiny-mce-toolbar-configuration.element.ts
@@ -6,7 +6,7 @@ import { firstValueFrom } from '@umbraco-cms/backoffice/external/rxjs';
 import { UmbDataTypePropertyCollection } from '@umbraco-cms/backoffice/components';
 import { tinymce } from '@umbraco-cms/backoffice/external/tinymce';
 
-const tinyIconSet = tinymce.default.IconManager.get('default');
+const tinyIconSet = tinymce.default?.IconManager.get('default');
 
 type ToolbarConfig = {
 	alias: string;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/toolbar/property-editor-ui-tiny-mce-toolbar-configuration.test.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/toolbar/property-editor-ui-tiny-mce-toolbar-configuration.test.ts
index 9d3df3f4d9..e54b1a385a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/toolbar/property-editor-ui-tiny-mce-toolbar-configuration.test.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/toolbar/property-editor-ui-tiny-mce-toolbar-configuration.test.ts
@@ -1,7 +1,6 @@
 import { expect, fixture, html } from '@open-wc/testing';
 import { UmbPropertyEditorUITinyMceToolbarConfigurationElement } from './property-editor-ui-tiny-mce-toolbar-configuration.element.js';
 import { defaultA11yConfig } from '@umbraco-cms/internal/test-utils';
-import '@umbraco-cms/backoffice/external/tinymce';
 
 describe('UmbPropertyEditorUITinyMceToolbarConfigurationElement', () => {
 	let element: UmbPropertyEditorUITinyMceToolbarConfigurationElement;