diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tiny-mce/input-tiny-mce.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tiny-mce/input-tiny-mce.element.ts index 6dbaaa6627..df18c48799 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tiny-mce/input-tiny-mce.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tiny-mce/input-tiny-mce.element.ts @@ -7,9 +7,9 @@ import { firstValueFrom } from 'rxjs'; import { UmbCurrentUserStore, UMB_CURRENT_USER_STORE_CONTEXT_TOKEN, -} from '../../../users/current-user/current-user.store'; -import type { UmbLoggedInUser } from '../../../users/current-user/types'; -import { availableLanguages } from './input-tiny-mce.languages'; +} from '../../../users/current-user/current-user.store.js'; +import type { UmbLoggedInUser } from '../../../users/current-user/types.js'; +import { availableLanguages } from './input-tiny-mce.languages.js'; import { TinyMcePluginArguments, UmbTinyMcePluginBase, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/index.ts index 9e16654e9e..4c20481508 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/index.ts @@ -2,7 +2,7 @@ import { UmbBackofficeNotificationContainerElement, UmbBackofficeModalContainerE import { manifests as debugManifests } from './debug/manifests.js'; import { manifests as propertyActionManifests } from './property-actions/manifests.js'; import { manifests as propertyEditorManifests } from './property-editors/manifests.js'; -import { manifests as tinyMcePluginManifests } from './property-editors/uis/tiny-mce/plugins/manifests'; +import { manifests as tinyMcePluginManifests } from './property-editors/uis/tiny-mce/plugins/manifests.js'; import { manifests as modalManifests } from './modal/common/manifests.js'; import { UmbStoreExtensionInitializer } from './store/index.js'; @@ -21,6 +21,7 @@ export * from './entity-action/index.js'; export * from './entity-bulk-action/index.js'; export * from './extension-registry/index.js'; export * from './id/index.js'; +export * from './macro/index.js'; export * from './menu/index.js'; export * from './modal/index.js'; export * from './notification/index.js'; diff --git a/src/Umbraco.Web.UI.Client/src/shared/macro/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/macro/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/shared/macro/index.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/macro/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/shared/macro/macro.service.ts b/src/Umbraco.Web.UI.Client/src/packages/core/macro/macro.service.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/shared/macro/macro.service.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/macro/macro.service.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/code-editor/code-editor-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/code-editor/code-editor-modal.element.ts index bb911fa578..e6155003ef 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/code-editor/code-editor-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/code-editor/code-editor-modal.element.ts @@ -1,7 +1,7 @@ import { customElement, query } from 'lit/decorators.js'; import { css, html } from 'lit'; import { ifDefined } from 'lit/directives/if-defined.js'; -import { UmbCodeEditorElement as UmbCodeEditor } from '../../../components/code-editor'; +import { UmbCodeEditorElement as UmbCodeEditor } from '../../../components/code-editor/code-editor.element.js'; import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui'; import { UmbCodeEditorModalData, UmbCodeEditorModalResult } from '@umbraco-cms/backoffice/modal'; import { UmbInputEvent } from '@umbraco-cms/backoffice/events'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/code-editor/code-editor-modal.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/code-editor/code-editor-modal.stories.ts index 0fe3ee8922..794b391ed4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/code-editor/code-editor-modal.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/code-editor/code-editor-modal.stories.ts @@ -1,4 +1,4 @@ -import '../confirm/confirm-modal.element'; +import '../confirm/confirm-modal.element.js'; import { Meta, Story } from '@storybook/web-components'; import { html } from 'lit'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/dimensions/property-editor-ui-tiny-mce-dimensions-configuration.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/dimensions/property-editor-ui-tiny-mce-dimensions-configuration.stories.ts index 561ce60d4c..ffc191b709 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/dimensions/property-editor-ui-tiny-mce-dimensions-configuration.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/dimensions/property-editor-ui-tiny-mce-dimensions-configuration.stories.ts @@ -1,9 +1,8 @@ import { Meta } from '@storybook/web-components'; -import { html } from 'lit-html'; - -import './property-editor-ui-tiny-mce-dimensions-configuration.element'; -import { umbDataTypeData } from '../../../../../../../shared/mocks/data/data-type.data'; +import './property-editor-ui-tiny-mce-dimensions-configuration.element.js'; +import { umbDataTypeData } from '../../../../../../../mocks/data/data-type.data.js'; import { DataTypeResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import { html } from '@umbraco-cms/backoffice/external/lit'; const dataTypeData = umbDataTypeData.getById('dt-richTextEditor') as DataTypeResponseModel; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/dimensions/property-editor-ui-tiny-mce-dimensions-configuration.test.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/dimensions/property-editor-ui-tiny-mce-dimensions-configuration.test.ts index 0665995b0e..9e0924d0db 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/dimensions/property-editor-ui-tiny-mce-dimensions-configuration.test.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/dimensions/property-editor-ui-tiny-mce-dimensions-configuration.test.ts @@ -1,5 +1,5 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { UmbPropertyEditorUITinyMceDimensionsConfigurationElement } from './property-editor-ui-tiny-mce-dimensions-configuration.element'; +import { UmbPropertyEditorUITinyMceDimensionsConfigurationElement } from './property-editor-ui-tiny-mce-dimensions-configuration.element.js'; import { defaultA11yConfig } from '@umbraco-cms/internal/test-utils'; describe('UmbPropertyEditorUITinyMceDimensionsConfigurationElement', () => { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/max-image-size/property-editor-ui-tiny-mce-maximagesize-configuration.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/max-image-size/property-editor-ui-tiny-mce-maximagesize-configuration.stories.ts index ac9e6513ec..0611769c76 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/max-image-size/property-editor-ui-tiny-mce-maximagesize-configuration.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/max-image-size/property-editor-ui-tiny-mce-maximagesize-configuration.stories.ts @@ -1,8 +1,8 @@ import { Meta } from '@storybook/web-components'; import { html } from 'lit-html'; -import { umbDataTypeData } from '../../../../../../../shared/mocks/data/data-type.data'; +import { umbDataTypeData } from '../../../../../../../mocks/data/data-type.data.js'; -import './property-editor-ui-tiny-mce-maximagesize-configuration.element'; +import './property-editor-ui-tiny-mce-maximagesize-configuration.element.js'; import { DataTypeResponseModel } from '@umbraco-cms/backoffice/backend-api'; const dataTypeData = umbDataTypeData.getById('dt-richTextEditor') as DataTypeResponseModel; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/max-image-size/property-editor-ui-tiny-mce-maximagesize-configuration.test.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/max-image-size/property-editor-ui-tiny-mce-maximagesize-configuration.test.ts index 61f5a0f520..c5d332a134 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/max-image-size/property-editor-ui-tiny-mce-maximagesize-configuration.test.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/max-image-size/property-editor-ui-tiny-mce-maximagesize-configuration.test.ts @@ -1,5 +1,5 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { UmbPropertyEditorUITinyMceMaxImageSizeConfigurationElement } from './property-editor-ui-tiny-mce-maximagesize-configuration.element'; +import { UmbPropertyEditorUITinyMceMaxImageSizeConfigurationElement } from './property-editor-ui-tiny-mce-maximagesize-configuration.element.js'; import { defaultA11yConfig } from '@umbraco-cms/internal/test-utils'; describe('UmbPropertyEditorUITinyMceMaxImSizeConfigurationElement', () => { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/stylesheets/property-editor-ui-tiny-mce-stylesheets-configuration.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/stylesheets/property-editor-ui-tiny-mce-stylesheets-configuration.stories.ts index a9fc18c4a7..7400a6c4ba 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/stylesheets/property-editor-ui-tiny-mce-stylesheets-configuration.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/stylesheets/property-editor-ui-tiny-mce-stylesheets-configuration.stories.ts @@ -1,8 +1,8 @@ import { Meta } from '@storybook/web-components'; import { html } from 'lit-html'; -import { umbDataTypeData } from '../../../../../../../shared/mocks/data/data-type.data'; +import { umbDataTypeData } from '../../../../../../../mocks/data/data-type.data.js'; -import './property-editor-ui-tiny-mce-stylesheets-configuration.element'; +import './property-editor-ui-tiny-mce-stylesheets-configuration.element.js'; import { DataTypeResponseModel } from '@umbraco-cms/backoffice/backend-api'; const dataTypeData = umbDataTypeData.getById('dt-richTextEditor') as DataTypeResponseModel; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/stylesheets/property-editor-ui-tiny-mce-stylesheets-configuration.test.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/stylesheets/property-editor-ui-tiny-mce-stylesheets-configuration.test.ts index b00d7a0d31..aeb5a5df8a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/stylesheets/property-editor-ui-tiny-mce-stylesheets-configuration.test.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/stylesheets/property-editor-ui-tiny-mce-stylesheets-configuration.test.ts @@ -1,5 +1,5 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { UmbPropertyEditorUITinyMceStylesheetsConfigurationElement } from './property-editor-ui-tiny-mce-stylesheets-configuration.element'; +import { UmbPropertyEditorUITinyMceStylesheetsConfigurationElement } from './property-editor-ui-tiny-mce-stylesheets-configuration.element.js'; import { defaultA11yConfig } from '@umbraco-cms/internal/test-utils'; describe('UmbPropertyEditorUITinyMceStylesheetsConfigurationElement', () => { 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.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/toolbar/property-editor-ui-tiny-mce-toolbar-configuration.stories.ts index 097942a1dd..5ec5bad123 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/toolbar/property-editor-ui-tiny-mce-toolbar-configuration.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/config/toolbar/property-editor-ui-tiny-mce-toolbar-configuration.stories.ts @@ -1,8 +1,8 @@ import { Meta } from '@storybook/web-components'; import { html } from 'lit-html'; -import { umbDataTypeData } from '../../../../../../../shared/mocks/data/data-type.data'; +import { umbDataTypeData } from '../../../../../../../mocks/data/data-type.data.js'; -import './property-editor-ui-tiny-mce-toolbar-configuration.element'; +import './property-editor-ui-tiny-mce-toolbar-configuration.element.js'; import { DataTypeResponseModel } from '@umbraco-cms/backoffice/backend-api'; const dataTypeData = umbDataTypeData.getById('dt-richTextEditor') as DataTypeResponseModel; 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 a19b48ce2d..8fa7330def 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,6 +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 { UmbPropertyEditorUITinyMceToolbarConfigurationElement } from './property-editor-ui-tiny-mce-toolbar-configuration.element'; describe('UmbPropertyEditorUITinyMceToolbarConfigurationElement', () => { let element: UmbPropertyEditorUITinyMceToolbarConfigurationElement; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/plugins/tiny-mce-macropicker.plugin.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/plugins/tiny-mce-macropicker.plugin.ts index f09dabac73..99f9f246b4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/plugins/tiny-mce-macropicker.plugin.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/plugins/tiny-mce-macropicker.plugin.ts @@ -1,7 +1,7 @@ import { AstNode } from 'tinymce'; +import { MacroSyntaxData, UmbMacroService } from '@umbraco-cms/backoffice/macro'; import { TinyMcePluginArguments, UmbTinyMcePluginBase } from '@umbraco-cms/backoffice/extension-registry'; import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN, UMB_CONFIRM_MODAL } from '@umbraco-cms/backoffice/modal'; -import { MacroSyntaxData, UmbMacroService } from 'src/shared/macro'; interface DialogData { richTextEditor: boolean; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/plugins/tiny-mce-mediapicker.plugin.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/plugins/tiny-mce-mediapicker.plugin.ts index b94191c6f6..178163585d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/plugins/tiny-mce-mediapicker.plugin.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/plugins/tiny-mce-mediapicker.plugin.ts @@ -1,5 +1,5 @@ -import type { UmbLoggedInUser } from '../../../../../users/current-user/types'; -import { UmbCurrentUserStore, UMB_CURRENT_USER_STORE_CONTEXT_TOKEN } from '../../../../../users/current-user/current-user.store'; +import type { UmbLoggedInUser } from '../../../../../users/current-user/types.js'; +import { UmbCurrentUserStore, UMB_CURRENT_USER_STORE_CONTEXT_TOKEN } from '../../../../../users/current-user/current-user.store.js'; import { TinyMcePluginArguments, UmbTinyMcePluginBase } from '@umbraco-cms/backoffice/extension-registry'; import { UmbMediaHelper } from '@umbraco-cms/backoffice/utils'; import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN, UmbMediaTreePickerModalResult, UMB_MEDIA_TREE_PICKER_MODAL } from '@umbraco-cms/backoffice/modal'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/property-editor-ui-tiny-mce.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/property-editor-ui-tiny-mce.stories.ts index f3c5172686..de62da8643 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/property-editor-ui-tiny-mce.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/property-editor-ui-tiny-mce.stories.ts @@ -1,5 +1,5 @@ import { Meta } from '@storybook/web-components'; -import { umbDataTypeData } from '../../../../../../../shared/mocks/data/data-type.data'; +import { umbDataTypeData } from '../../../../../mocks/data/data-type.data.js'; import { html } from '@umbraco-cms/backoffice/external/lit'; import type { DataTypeResponseModel, diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json index 63d073b459..8764d7ffd9 100644 --- a/src/Umbraco.Web.UI.Client/tsconfig.json +++ b/src/Umbraco.Web.UI.Client/tsconfig.json @@ -35,7 +35,6 @@ // SHARED "@umbraco-cms/backoffice/events": ["src/shared/umb-events"], - "@umbraco-cms/backoffice/macros": ["src/shared/macros"], "@umbraco-cms/backoffice/models": ["src/shared/models"], "@umbraco-cms/backoffice/repository": ["src/shared/repository"], "@umbraco-cms/backoffice/resources": ["src/shared/resources"], @@ -53,6 +52,7 @@ "@umbraco-cms/backoffice/entity-bulk-action": ["src/packages/core/entity-bulk-action"], "@umbraco-cms/backoffice/extension-registry": ["src/packages/core/extension-registry"], "@umbraco-cms/backoffice/id": ["src/packages/core/id"], + "@umbraco-cms/backoffice/macro": ["src/packages/core/macro"], "@umbraco-cms/backoffice/menu": ["src/packages/core/menu"], "@umbraco-cms/backoffice/modal": ["src/packages/core/modal"], "@umbraco-cms/backoffice/notification": ["src/packages/core/notification"], diff --git a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs index 625ef842d0..23f2254fa7 100644 --- a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs +++ b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs @@ -48,7 +48,6 @@ export default { '@umbraco-cms/backoffice/observable-api': './src/libs/observable-api/index.ts', '@umbraco-cms/backoffice/events': './src/shared/umb-events/index.ts', - '@umbraco-cms/backoffice/macros': './src/shared/macros/index.ts', '@umbraco-cms/backoffice/models': './src/shared/models/index.ts', '@umbraco-cms/backoffice/repository': './src/shared/repository/index.ts', '@umbraco-cms/backoffice/resources': './src/shared/resources/index.ts', @@ -68,6 +67,7 @@ export default { '@umbraco-cms/backoffice/entity-bulk-action': './src/packages/core/entity-bulk-action/index.ts', '@umbraco-cms/backoffice/extension-registry': './src/packages/core/extension-registry/index.ts', '@umbraco-cms/backoffice/id': './src/packages/core/id/index.ts', + '@umbraco-cms/backoffice/macro': './src/packages/core/macro/index.ts', '@umbraco-cms/backoffice/menu': './src/packages/core/menu/index.ts', '@umbraco-cms/backoffice/modal': './src/packages/core/modal/index.ts', '@umbraco-cms/backoffice/notification': './src/packages/core/notification/index.ts',