Merge branch 'main' into v15/feature/validate-specific-cultures

nielslyngsoe · web-flow · commit eac967b5d0f4 · 2024-09-23T14:51:08.000+02:00
diff --git a/src/packages/code-editor/code-editor-modal/code-editor-modal.element.ts b/src/packages/code-editor/code-editor-modal/code-editor-modal.element.ts
@@ -1,9 +1,7 @@
+import type { UmbCodeEditorElement } from '../components/code-editor.element.js';
+import type { UmbCodeEditorModalData, UmbCodeEditorModalValue } from './code-editor-modal.token.js';
 import { css, html, ifDefined, customElement, query } from '@umbraco-cms/backoffice/external/lit';
 import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
-import type { UmbCodeEditorElement } from '@umbraco-cms/backoffice/code-editor';
-import type { UmbCodeEditorModalData, UmbCodeEditorModalValue } from '@umbraco-cms/backoffice/modal';
-
-import '@umbraco-cms/backoffice/code-editor';
 
 const elementName = 'umb-code-editor-modal';
 
diff --git a/src/packages/code-editor/code-editor-modal/code-editor-modal.stories.ts b/src/packages/code-editor/code-editor-modal/code-editor-modal.stories.ts
@@ -1,8 +1,8 @@
 import '../confirm/confirm-modal.element.js';
 
+import type { UmbCodeEditorModalData } from './code-editor-modal.token.js';
 import type { Meta, Story } from '@storybook/web-components';
 import { html } from '@umbraco-cms/backoffice/external/lit';
-import type { UmbCodeEditorModalData } from '@umbraco-cms/backoffice/modal';
 
 export default {
 	title: 'API/Modals/Layouts/Code Editor',
diff --git a/src/packages/code-editor/code-editor-modal/code-editor-modal.token.ts b/src/packages/code-editor/code-editor-modal/code-editor-modal.token.ts
@@ -1,4 +1,4 @@
-import { UmbModalToken } from './modal-token.js';
+import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 // TODO => investigate why exporting CodeEditorLanguage in code-editor barrel
 // causes the schema generation task to fail... For now, language property below
diff --git a/src/packages/code-editor/code-editor-modal/index.ts b/src/packages/code-editor/code-editor-modal/index.ts
@@ -0,0 +1 @@
+export * from './code-editor-modal.token.js';
diff --git a/src/packages/code-editor/code-editor-modal/manifests.ts b/src/packages/code-editor/code-editor-modal/manifests.ts
@@ -0,0 +1,8 @@
+export const manifests: Array<UmbExtensionManifest> = [
+	{
+		type: 'modal',
+		alias: 'Umb.Modal.CodeEditor',
+		name: 'Code Editor Modal',
+		element: () => import('./code-editor-modal.element.js'),
+	},
+];
diff --git a/src/packages/code-editor/index.ts b/src/packages/code-editor/index.ts
@@ -1,5 +1,7 @@
 export * from './components/index.js';
 export * from './models/index.js';
+export * from './code-editor-modal/index.js';
+
 export type { UmbCodeEditorController } from './code-editor.controller.js';
 
 /**
diff --git a/src/packages/code-editor/manifests.ts b/src/packages/code-editor/manifests.ts
@@ -1,3 +1,4 @@
 import { manifest as propertyEditorManifest } from './property-editor/manifests.js';
+import { manifests as codeEditorModalManifests } from './code-editor-modal/manifests.js';
 
-export const manifests: Array<UmbExtensionManifest> = [propertyEditorManifest];
+export const manifests: Array<UmbExtensionManifest> = [propertyEditorManifest, ...codeEditorModalManifests];
diff --git a/src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.element.ts b/src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.element.ts
@@ -1,10 +1,10 @@
+import type { UmbIconPickerModalData, UmbIconPickerModalValue } from './icon-picker-modal.token.js';
 import { css, customElement, html, nothing, query, repeat, state } from '@umbraco-cms/backoffice/external/lit';
 import { extractUmbColorVariable, umbracoColors } from '@umbraco-cms/backoffice/resources';
 import { umbFocus } from '@umbraco-cms/backoffice/lit-element';
 import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { UMB_ICON_REGISTRY_CONTEXT, type UmbIconDefinition } from '@umbraco-cms/backoffice/icon';
-import type { UmbIconPickerModalData, UmbIconPickerModalValue } from '@umbraco-cms/backoffice/modal';
 import type { UUIColorSwatchesEvent } from '@umbraco-cms/backoffice/external/uui';
 
 @customElement('umb-icon-picker-modal')
diff --git a/src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.stories.ts b/src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.stories.ts
@@ -2,11 +2,10 @@ import '../../../components/body-layout/body-layout.element.js';
 import './icon-picker-modal.element.js';
 
 import type { UmbIconPickerModalElement } from './icon-picker-modal.element.js';
+import type { UmbIconPickerModalValue } from './icon-picker-modal.token.js';
 import type { Meta, Story } from '@storybook/web-components';
 import { html } from '@umbraco-cms/backoffice/external/lit';
 
-import type { UmbIconPickerModalValue } from '@umbraco-cms/backoffice/modal';
-
 export default {
 	title: 'API/Modals/Layouts/Icon Picker',
 	component: 'umb-icon-picker-modal',
diff --git a/src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.test.ts b/src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.test.ts
diff --git a/src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.token.ts b/src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.token.ts
@@ -1,4 +1,4 @@
-import { UmbModalToken } from './modal-token.js';
+import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 export type UmbIconPickerModalData = never;
 
diff --git a/src/packages/core/icon-registry/icon-picker-modal/index.ts b/src/packages/core/icon-registry/icon-picker-modal/index.ts
@@ -0,0 +1,2 @@
+export * from './icon-picker-modal.token.js';
+export * from './icon-picker-modal.element.js';
diff --git a/src/packages/core/icon-registry/icon-picker-modal/manifests.ts b/src/packages/core/icon-registry/icon-picker-modal/manifests.ts
@@ -0,0 +1,8 @@
+export const manifests: Array<UmbExtensionManifest> = [
+	{
+		type: 'modal',
+		alias: 'Umb.Modal.IconPicker',
+		name: 'Icon Picker Modal',
+		element: () => import('./icon-picker-modal.element.js'),
+	},
+];
diff --git a/src/packages/core/icon-registry/index.ts b/src/packages/core/icon-registry/index.ts
@@ -2,3 +2,4 @@ export * from './icon-registry.context-token.js';
 export * from './icon-registry.context.js';
 export * from './icon.registry.js';
 export * from './types.js';
+export * from './icon-picker-modal/index.js';
diff --git a/src/packages/core/icon-registry/manifests.ts b/src/packages/core/icon-registry/manifests.ts
@@ -1,3 +1,5 @@
+import { manifests as iconPickerModalManifests } from './icon-picker-modal/manifests.js';
+
 export const manifests: Array<UmbExtensionManifest> = [
 	{
 		type: 'icons',
@@ -11,4 +13,5 @@ export const manifests: Array<UmbExtensionManifest> = [
 		name: 'Icons Context',
 		api: () => import('./icon-registry.context.js'),
 	},
+	...iconPickerModalManifests,
 ];
diff --git a/src/packages/core/modal/common/manifests.ts b/src/packages/core/modal/common/manifests.ts
@@ -5,18 +5,6 @@ export const manifests: Array<UmbExtensionManifest> = [
 		name: 'Confirm Modal',
 		element: () => import('./confirm/confirm-modal.element.js'),
 	},
-	{
-		type: 'modal',
-		alias: 'Umb.Modal.IconPicker',
-		name: 'Icon Picker Modal',
-		element: () => import('./icon-picker/icon-picker-modal.element.js'),
-	},
-	{
-		type: 'modal',
-		alias: 'Umb.Modal.CodeEditor',
-		name: 'Code Editor Modal',
-		element: () => import('./code-editor/code-editor-modal.element.js'),
-	},
 	{
 		type: 'modal',
 		alias: 'Umb.Modal.EmbeddedMedia',
diff --git a/src/packages/core/modal/token/index.ts b/src/packages/core/modal/token/index.ts
@@ -1,10 +1,8 @@
 export * from './change-password-modal.token.js';
-export * from './code-editor-modal.token.js';
 export * from './confirm-modal.token.js';
 export * from './debug-modal.token.js';
 export * from './embedded-media-modal.token.js';
 export * from './entity-user-permission-settings-modal.token.js';
-export * from './icon-picker-modal.token.js';
 export * from './item-picker-modal.token.js';
 export * from './modal-token.js';
 export * from './property-editor-ui-picker-modal.token.js';
diff --git a/src/packages/documents/document-types/workspace/document-type-workspace-editor.element.ts b/src/packages/documents/document-types/workspace/document-type-workspace-editor.element.ts
@@ -2,7 +2,8 @@ import { UMB_DOCUMENT_TYPE_WORKSPACE_CONTEXT } from './document-type-workspace.c
 import type { UmbInputWithAliasElement } from '@umbraco-cms/backoffice/components';
 import { umbFocus, UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { css, html, customElement, state, ifDefined } from '@umbraco-cms/backoffice/external/lit';
-import { UMB_MODAL_MANAGER_CONTEXT, UMB_ICON_PICKER_MODAL } from '@umbraco-cms/backoffice/modal';
+import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
+import { UMB_ICON_PICKER_MODAL } from '@umbraco-cms/backoffice/icon';
 import type { UUITextareaElement } from '@umbraco-cms/backoffice/external/uui';
 import { umbBindToValidation } from '@umbraco-cms/backoffice/validation';
 
diff --git a/src/packages/media/media-types/workspace/media-type-workspace-editor.element.ts b/src/packages/media/media-types/workspace/media-type-workspace-editor.element.ts
@@ -2,7 +2,8 @@ import type { UmbMediaTypeWorkspaceContext } from './media-type-workspace.contex
 import { UMB_MEDIA_TYPE_WORKSPACE_CONTEXT } from './media-type-workspace.context-token.js';
 import { css, html, customElement, state, ifDefined } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement, umbFocus } from '@umbraco-cms/backoffice/lit-element';
-import { UMB_ICON_PICKER_MODAL, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
+import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
+import { UMB_ICON_PICKER_MODAL } from '@umbraco-cms/backoffice/icon';
 import type { UmbInputWithAliasElement } from '@umbraco-cms/backoffice/components';
 import type { UUITextareaElement } from '@umbraco-cms/backoffice/external/uui';
 
diff --git a/src/packages/members/member-type/workspace/member-type-workspace-editor.element.ts b/src/packages/members/member-type/workspace/member-type-workspace-editor.element.ts
@@ -3,7 +3,8 @@ import type { UmbInputWithAliasElement } from '@umbraco-cms/backoffice/component
 import { css, html, customElement, state, ifDefined } from '@umbraco-cms/backoffice/external/lit';
 import type { UUITextareaElement } from '@umbraco-cms/backoffice/external/uui';
 import { UmbLitElement, umbFocus } from '@umbraco-cms/backoffice/lit-element';
-import { UMB_ICON_PICKER_MODAL, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
+import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
+import { UMB_ICON_PICKER_MODAL } from '@umbraco-cms/backoffice/icon';
 
 @customElement('umb-member-type-workspace-editor')
 export class UmbMemberTypeWorkspaceEditorElement extends UmbLitElement {
diff --git a/src/packages/property-editors/collection/config/layout/layout-configuration.element.ts b/src/packages/property-editors/collection/config/layout/layout-configuration.element.ts
@@ -14,11 +14,12 @@ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbPropertyValueChangeEvent } from '@umbraco-cms/backoffice/property-editor';
 import { UmbSorterController } from '@umbraco-cms/backoffice/sorter';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
-import { UMB_ICON_PICKER_MODAL, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
+import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
 import type { UmbInputManifestElement } from '@umbraco-cms/backoffice/components';
 import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry';
 import type { UUIInputElement, UUIInputEvent } from '@umbraco-cms/backoffice/external/uui';
+import { UMB_ICON_PICKER_MODAL } from '@umbraco-cms/backoffice/icon';
 
 interface UmbCollectionLayoutConfiguration {
 	icon?: string;
diff --git a/src/packages/property-editors/icon-picker/property-editor-ui-icon-picker.element.ts b/src/packages/property-editors/icon-picker/property-editor-ui-icon-picker.element.ts
@@ -1,6 +1,7 @@
 import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
 import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry';
-import { UMB_MODAL_MANAGER_CONTEXT, UMB_ICON_PICKER_MODAL } from '@umbraco-cms/backoffice/modal';
+import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
+import { UMB_ICON_PICKER_MODAL } from '@umbraco-cms/backoffice/icon';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { extractUmbColorVariable } from '@umbraco-cms/backoffice/resources';
 import { UmbPropertyValueChangeEvent } from '@umbraco-cms/backoffice/property-editor';
diff --git a/src/packages/property-editors/icon-picker/property-editor-ui-icon-picker.stories.ts b/src/packages/property-editors/icon-picker/property-editor-ui-icon-picker.stories.ts
@@ -1,4 +1,4 @@
-import type { UmbIconPickerModalElement } from '../../core/modal/common/icon-picker/icon-picker-modal.element.js';
+import type { UmbIconPickerModalElement } from '@umbraco-cms/backoffice/icon';
 import type { Meta, Story } from '@storybook/web-components';
 import { html } from '@umbraco-cms/backoffice/external/lit';
 
diff --git a/src/packages/tiny-mce/plugins/tiny-mce-code-editor.plugin.ts b/src/packages/tiny-mce/plugins/tiny-mce-code-editor.plugin.ts
@@ -1,6 +1,7 @@
 import { type TinyMcePluginArguments, UmbTinyMcePluginBase } from '../components/input-tiny-mce/tiny-mce-plugin.js';
 import { UmbLocalizationController } from '@umbraco-cms/backoffice/localization-api';
-import { UMB_CODE_EDITOR_MODAL, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
+import { UMB_CODE_EDITOR_MODAL } from '@umbraco-cms/backoffice/code-editor';
+import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
 
 export default class UmbTinyMceCodeEditorPlugin extends UmbTinyMcePluginBase {
 	constructor(args: TinyMcePluginArguments) {
diff --git a/src/packages/user/user-group/workspace/user-group/user-group-workspace-editor.element.ts b/src/packages/user/user-group/workspace/user-group/user-group-workspace-editor.element.ts
@@ -10,8 +10,9 @@ import type { UmbInputDocumentElement } from '@umbraco-cms/backoffice/document';
 import type { UmbInputSectionElement } from '@umbraco-cms/backoffice/section';
 import type { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
 import type { UmbInputMediaElement } from '@umbraco-cms/backoffice/media';
-import { UMB_ICON_PICKER_MODAL, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
+import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
 import type { UmbInputLanguageElement } from '@umbraco-cms/backoffice/language';
+import { UMB_ICON_PICKER_MODAL } from '@umbraco-cms/backoffice/icon';
 
 import './components/user-group-entity-user-permission-list.element.js';
 import './components/user-group-granular-permission-list.element.js';

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { UmbModalToken } from './modal-token.js';`
	`1`	`+import { UmbModalToken } from '@umbraco-cms/backoffice/modal';`
`2`	`2`
`3`	`3`	`// TODO => investigate why exporting CodeEditorLanguage in code-editor barrel`
`4`	`4`	`// causes the schema generation task to fail... For now, language property below`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export * from './code-editor-modal.token.js';`