diff --git a/src/Umbraco.Web.UI.Client/libs/macro/index.ts b/src/Umbraco.Web.UI.Client/libs/macro/index.ts new file mode 100644 index 0000000000..8a32e49495 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/libs/macro/index.ts @@ -0,0 +1 @@ +export * from './macro.service'; \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/libs/macro/rollup.config.js b/src/Umbraco.Web.UI.Client/libs/macro/rollup.config.js deleted file mode 100644 index 945c0afe88..0000000000 --- a/src/Umbraco.Web.UI.Client/libs/macro/rollup.config.js +++ /dev/null @@ -1,4 +0,0 @@ -import config from '../../utils/rollup.config.js'; -export default { - ...config, -}; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/plugins/tiny-mce-macropicker.plugin.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/plugins/tiny-mce-macropicker.plugin.ts index de20b6de4d..6d2b2f50ba 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/plugins/tiny-mce-macropicker.plugin.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/plugins/tiny-mce-macropicker.plugin.ts @@ -1,8 +1,8 @@ import { AstNode } from 'tinymce'; import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/modal'; +import { MacroSyntaxData, UmbMacroService } from '@umbraco-cms/backoffice/macro'; import { UMB_CONFIRM_MODAL_TOKEN } from '../../../../modals/confirm'; import { TinyMcePluginArguments, TinyMcePluginBase } from './tiny-mce-plugin'; -import { MacroSyntaxData, UmbMacroService } from 'libs/macro/macro.service'; interface DialogData { richTextEditor: boolean; diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json index 40bbd59d48..691efe96f9 100644 --- a/src/Umbraco.Web.UI.Client/tsconfig.json +++ b/src/Umbraco.Web.UI.Client/tsconfig.json @@ -28,6 +28,7 @@ "@umbraco-cms/backoffice/events": ["libs/umb-events"], "@umbraco-cms/backoffice/extensions-api": ["libs/extensions-api"], "@umbraco-cms/backoffice/extensions-registry": ["libs/extensions-registry"], + "@umbraco-cms/backoffice/macro": ["libs/macro"], "@umbraco-cms/backoffice/modal": ["libs/modal"], "@umbraco-cms/backoffice/models": ["libs/models"], "@umbraco-cms/backoffice/notification": ["libs/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 2aa8016715..eacc5a70f2 100644 --- a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs +++ b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs @@ -46,6 +46,7 @@ export default { '@umbraco-cms/backoffice/events': './libs/umb-events/index.ts', '@umbraco-cms/backoffice/extensions-api': './libs/extensions-api/index.ts', '@umbraco-cms/backoffice/extensions-registry': './libs/extensions-registry/index.ts', + '@umbraco-cms/backoffice/macro': './libs/macro/index.ts', '@umbraco-cms/backoffice/modal': './libs/modal/index.ts', '@umbraco-cms/backoffice/models': './libs/models/index.ts', '@umbraco-cms/backoffice/notification': './libs/notification/index.ts',