Merge branch 'v15/dev' into v15/emm-tree

Author: madsrasmussen

src/packages/core/extension-registry/conditions/manifests.ts

@@ -1,10 +1,5 @@
 import type { ManifestTypes } from '../models/index.js';
-import { manifest as multipleAppLanguagesConditionManifest } from './multiple-app-languages.condition.js';
 import { manifest as sectionAliasConditionManifest } from './section-alias.condition.js';
 import { manifest as switchConditionManifest } from './switch.condition.js';
 
-export const manifests: Array<ManifestTypes> = [
-	multipleAppLanguagesConditionManifest,
-	sectionAliasConditionManifest,
-	switchConditionManifest,
-];
+export const manifests: Array<ManifestTypes> = [sectionAliasConditionManifest, switchConditionManifest];

src/packages/core/extension-registry/conditions/types.ts

@@ -2,15 +2,13 @@ import type { CollectionAliasConditionConfig } from '../../collection/collection
 import type { CollectionBulkActionPermissionConditionConfig } from '../../collection/collection-bulk-action-permission.manifest.js';
 import type { SectionAliasConditionConfig } from './section-alias.condition.js';
 import type { SwitchConditionConfig } from './switch.condition.js';
-import type { UmbMultipleAppLanguageConditionConfig } from './multiple-app-languages.condition.js';
 import type { UmbConditionConfigBase } from '@umbraco-cms/backoffice/extension-api';
 
 export type ConditionTypes =
 	| CollectionAliasConditionConfig
 	| CollectionBulkActionPermissionConditionConfig
 	| SectionAliasConditionConfig
 	| SwitchConditionConfig
-	| UmbMultipleAppLanguageConditionConfig
 	| UmbConditionConfigBase;
 
 type UnionOfProperties<T> = T extends object ? T[keyof T] : never;

src/packages/core/extension-registry/conditions/multiple-app-languages.condition.ts renamed to src/packages/language/conditions/multiple-app-languages.condition.ts

@@ -1,14 +1,12 @@
-import { UmbConditionBase } from './condition-base.controller.js';
+import type { UmbMultipleAppLanguageConditionConfig } from './types.js';
 import { UMB_APP_LANGUAGE_CONTEXT } from '@umbraco-cms/backoffice/language';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import type {
 	ManifestCondition,
-	UmbConditionConfigBase,
 	UmbConditionControllerArguments,
 	UmbExtensionCondition,
 } from '@umbraco-cms/backoffice/extension-api';
-
-export type UmbMultipleAppLanguageConditionConfig = UmbConditionConfigBase;
+import { UmbConditionBase } from '@umbraco-cms/backoffice/extension-registry';
 
 export class UmbMultipleAppLanguageCondition
 	extends UmbConditionBase<UmbMultipleAppLanguageConditionConfig>

src/packages/language/conditions/types.ts

@@ -0,0 +1,3 @@
+import type { UmbConditionConfigBase } from '@umbraco-cms/backoffice/extension-api';
+
+export type UmbMultipleAppLanguageConditionConfig = UmbConditionConfigBase;

src/packages/language/manifests.ts

@@ -6,6 +6,7 @@ import { manifests as appLanguageSelect } from './app-language-select/manifests.
 import { manifests as modalManifests } from './modals/manifests.js';
 import { manifests as collectionManifests } from './collection/manifests.js';
 import { manifests as globalContextManifests } from './global-contexts/manifests.js';
+import { manifest as conditionsManifest } from './conditions/multiple-app-languages.condition.js';
 import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
 
 export const manifests: Array<ManifestTypes> = [
@@ -17,6 +18,7 @@ export const manifests: Array<ManifestTypes> = [
 	...modalManifests,
 	...collectionManifests,
 	...globalContextManifests,
+	conditionsManifest,
 	{
 		type: 'workspaceContext',
 		name: 'Document Language Access Workspace Context',

src/packages/language/types.ts

@@ -1,4 +1,5 @@
 import type { UmbLanguageEntityType } from './entity.js';
+export type * from './conditions/types.js';
 
 export interface UmbLanguageDetailModel {
 	entityType: UmbLanguageEntityType;