Merge branch 'main' into v15/feature/user-workspace-validation

Author: nielslyngsoe

src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/block-grid-area-type-workspace.modal-token.ts

@@ -1,4 +1,4 @@
-import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/modal';
+import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/workspace';
 import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type

src/packages/block/block-grid/workspace/block-grid-type-workspace.modal-token.ts

@@ -1,5 +1,5 @@
 import { UMB_BLOCK_GRID_TYPE, type UmbBlockGridTypeModel } from '../types.js';
-import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/modal';
+import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/workspace';
 import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 export type UmbBlockGridTypeWorkspaceData = UmbWorkspaceModalData<UmbBlockGridTypeModel>;

src/packages/block/block-grid/workspace/block-grid-workspace.modal-token.ts

@@ -1,5 +1,5 @@
 import type { UmbBlockWorkspaceData, UmbBlockWorkspaceOriginData } from '@umbraco-cms/backoffice/block';
-import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/modal';
+import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/workspace';
 import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 export interface UmbBlockGridWorkspaceOriginData extends UmbBlockWorkspaceOriginData {

src/packages/block/block-list/property-editors/block-list-type-configuration/property-editor-ui-block-list-type-configuration.element.ts

@@ -8,7 +8,7 @@ import {
 	type UmbPropertyEditorConfigCollection,
 } from '@umbraco-cms/backoffice/property-editor';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
-import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/modal';
+import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/workspace';
 import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/router';
 
 /**

src/packages/block/block-list/workspace/block-list-workspace.modal-token.ts

@@ -1,5 +1,5 @@
 import type { UmbBlockWorkspaceData } from '@umbraco-cms/backoffice/block';
-import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/modal';
+import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/workspace';
 import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 export interface UmbBlockListWorkspaceOriginData {

src/packages/block/block-rte/workspace/block-rte-workspace.modal-token.ts

@@ -1,5 +1,5 @@
 import type { UmbBlockWorkspaceData } from '@umbraco-cms/backoffice/block';
-import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/modal';
+import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/workspace';
 import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type

src/packages/block/block/workspace/block-workspace.modal-token.ts

@@ -1,4 +1,4 @@
-import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/modal';
+import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '@umbraco-cms/backoffice/workspace';
 import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type

src/packages/core/modal/common/code-editor/code-editor-modal.element.ts renamed to 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';
 

src/packages/core/modal/common/code-editor/code-editor-modal.stories.ts renamed to 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',

src/packages/core/modal/token/code-editor-modal.token.ts renamed to 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