Merge branch 'main' into v15/feature/emm-section

src/Umbraco.Web.UI.Client/src/packages/block/custom-view/custom-view.element.ts

@@ -1,29 +0,0 @@
-import type { UmbBlockDataType } from '@umbraco-cms/backoffice/block';
-import type { UmbBlockEditorCustomViewElement } from '@umbraco-cms/backoffice/block-custom-view';
-import { css, customElement, html, property } from '@umbraco-cms/backoffice/external/lit';
-import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
-
-@customElement('umb-custom-view-test')
-export class UmbCustomViewTestElement extends UmbLitElement implements UmbBlockEditorCustomViewElement {
-	@property({ attribute: false })
-	content?: UmbBlockDataType;
-
-	protected override render() {
-		return html` Hello ${this.content?.headline} `;
-	}
-
-	static override styles = [
-		css`
-			:host {
-				display: block;
-				height: 100%;
-				box-sizing: border-box;
-				background-color: #dddddd;
-				border-radius: 9px;
-				padding: 12px;
-			}
-		`,
-	];
-}
-
-export { UmbCustomViewTestElement as element };

src/Umbraco.Web.UI.Client/src/packages/block/custom-view/manifest.ts

@@ -1,8 +0,0 @@
-export const manifest: UmbExtensionManifest = {
-	type: 'blockEditorCustomView',
-	alias: 'Umb.blockEditorCustomView.TestView',
-	name: 'Block Editor Custom View Test',
-	element: () => import('./custom-view.element.js'),
-	forContentTypeAlias: 'elementTypeHeadline',
-	forBlockEditor: 'block-grid',
-};

src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts

@@ -32,7 +32,6 @@ import type { ManifestPreviewAppProvider } from './preview-app.model.js';
 import type { ManifestPropertyEditorUi, ManifestPropertyEditorSchema } from './property-editor.model.js';
 import type { ManifestRepository } from './repository.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';
@@ -73,7 +72,6 @@ export type * from './preview-app.model.js';
 export type * from './property-editor.model.js';
 export type * from './repository.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';
@@ -133,7 +131,6 @@ export type ManifestTypes =
 	| ManifestPropertyEditorUi
 	| ManifestRepository
 	| ManifestStore
-	| ManifestTheme
 	| ManifestTinyMcePlugin
 	| ManifestTreeStore
 	| ManifestUfmComponent

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';

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<ManifestGlobalContext | ManifestTheme> = [
+export const themes: Array<UmbExtensionManifest> = [
 	{
 		type: 'globalContext',
 		alias: 'Umb.GlobalContext.Theme',

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';
 

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;
+	}
+}