From adbf51de96cdde69b20d83624f4c8bdf7539e79b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Sat, 28 Sep 2024 21:02:52 +0200 Subject: [PATCH 1/2] move theme extension --- .../src/packages/core/extension-registry/models/index.ts | 3 --- src/Umbraco.Web.UI.Client/src/packages/core/themes/index.ts | 1 + .../src/packages/core/themes/manifests.ts | 4 +--- .../models/theme.model.ts => themes/theme.extension.ts} | 6 ++++++ 4 files changed, 8 insertions(+), 6 deletions(-) rename src/Umbraco.Web.UI.Client/src/packages/core/{extension-registry/models/theme.model.ts => themes/theme.extension.ts} (74%) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts index afa28545e2..fe415fa0c6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts @@ -38,7 +38,6 @@ import type { ManifestSection } from './section.model.js'; import type { ManifestSectionSidebarApp, ManifestSectionSidebarAppMenuKind } from './section-sidebar-app.model.js'; import type { ManifestSectionView } from './section-view.model.js'; import type { ManifestStore, ManifestTreeStore, ManifestItemStore } from './store.model.js'; -import type { ManifestTheme } from './theme.model.js'; import type { ManifestTinyMcePlugin } from './tinymce-plugin.model.js'; import type { ManifestUfmComponent } from './ufm-component.model.js'; import type { ManifestUfmFilter } from './ufm-filter.model.js'; @@ -86,7 +85,6 @@ export type * from './section-sidebar-app.model.js'; export type * from './section-view.model.js'; export type * from './section.model.js'; export type * from './store.model.js'; -export type * from './theme.model.js'; export type * from './tinymce-plugin.model.js'; export type * from './ufm-component.model.js'; export type * from './ufm-filter.model.js'; @@ -156,7 +154,6 @@ export type ManifestTypes = | ManifestSectionSidebarAppMenuKind | ManifestSectionView | ManifestStore - | ManifestTheme | ManifestTinyMcePlugin | ManifestTreeStore | ManifestUfmComponent diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/themes/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/themes/index.ts index 4ddb8ab390..cbd456ebd2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/themes/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/themes/index.ts @@ -1 +1,2 @@ export * from './theme.context.js'; +export type * from './theme.extension.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/themes/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/themes/manifests.ts index c0fa95cccf..25716a128b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/themes/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/themes/manifests.ts @@ -1,6 +1,4 @@ -import type { ManifestGlobalContext, ManifestTheme } from '@umbraco-cms/backoffice/extension-registry'; - -export const themes: Array = [ +export const themes: Array = [ { type: 'globalContext', alias: 'Umb.GlobalContext.Theme', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/theme.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/themes/theme.extension.ts similarity index 74% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/theme.model.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/themes/theme.extension.ts index 2b003bc712..498549b025 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/theme.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/themes/theme.extension.ts @@ -5,3 +5,9 @@ import type { ManifestPlainCss } from '@umbraco-cms/backoffice/extension-api'; export interface ManifestTheme extends ManifestPlainCss { type: 'theme'; } + +declare global { + interface UmbExtensionManifestMap { + UMB_THEME: ManifestTheme; + } +} From 55d2de355d1294f5b8f7b3f2c56d4b401aa92a0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Sat, 28 Sep 2024 21:28:39 +0200 Subject: [PATCH 2/2] import correction --- .../src/packages/core/themes/theme.context.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/themes/theme.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/themes/theme.context.ts index 15793091f4..9aef39984a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/themes/theme.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/themes/theme.context.ts @@ -3,7 +3,7 @@ import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registr import { UmbContextBase } from '@umbraco-cms/backoffice/class-api'; import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; import { UmbStringState } from '@umbraco-cms/backoffice/observable-api'; -import type { ManifestTheme } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTheme } from '@umbraco-cms/backoffice/themes'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { UmbObserverController } from '@umbraco-cms/backoffice/observable-api';