more import updates

src/Umbraco.Web.UI.Client/eslint-local-rules.cjs

@@ -142,6 +142,7 @@ module.exports = {
 
 	// TODO: Its not bullet proof, but it will catch most/some cases.
 	/** @type {import('eslint').Rule.RuleModule} */
+	/*
 	'prefer-umbraco-cms-imports': {
 		meta: {
 			type: 'suggestion',
@@ -174,6 +175,7 @@ module.exports = {
 			};
 		},
 	},
+	*/
 
 	/** @type {import('eslint').Rule.RuleModule} */
 	'no-external-imports': {

src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts

@@ -1,9 +1,6 @@
 import '@umbraco-ui/uui-css/dist/uui-css.css';
 import 'element-internals-polyfill';
 
-import '../../shared/router/router-slot.element';
-import '../../shared/router/variant-router-slot.element';
-
 import { UUIIconRegistryEssential } from '@umbraco-ui/uui';
 import { css, html } from 'lit';
 import { customElement, property } from 'lit/decorators.js';

src/Umbraco.Web.UI.Client/src/packages/core/components/index.ts

@@ -15,9 +15,6 @@ import './debug/debug.element';
 import './empty-state/empty-state.element';
 import './extension-slot/extension-slot.element';
 
-import './backoffice-modal-container/backoffice-modal-container.element';
-import './backoffice-notification-container/backoffice-notification-container.element';
-
 import './date-input/date-input.element';
 
 import './input-checkbox-list/input-checkbox-list.element';
@@ -39,6 +36,8 @@ import './history/history-item.element';
 import './variant-selector/variant-selector.element';
 
 export * from './table';
+export * from './backoffice-notification-container/backoffice-notification-container.element';
+export * from './backoffice-modal-container/backoffice-modal-container.element';
 
 //export * from './code-editor';
 

src/Umbraco.Web.UI.Client/src/packages/core/components/workspace-property/workspace-property.context.ts

@@ -1,5 +1,5 @@
 import { UmbWorkspaceVariableEntityContextInterface } from '../workspace/workspace-context/workspace-variable-entity-context.interface';
-import { UMB_WORKSPACE_VARIANT_CONTEXT_TOKEN } from '../workspace/workspace-variant/workspace-variant.context';
+import { UMB_WORKSPACE_VARIANT_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/workspace';
 import { UmbVariantId } from '@umbraco-cms/backoffice/variant';
 import type { DataTypeResponseModel } from '@umbraco-cms/backoffice/backend-api';
 import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';

src/Umbraco.Web.UI.Client/src/packages/core/index.ts

@@ -1,12 +1,14 @@
-import { manifests as componentManifests, UmbStoreExtensionInitializer } from './components';
+import {
+	manifests as componentManifests,
+	UmbBackofficeNotificationContainerElement,
+	UmbBackofficeModalContainerElement,
+} from './components';
 import { manifests as propertyActionManifests } from './property-actions/manifests';
 import { manifests as propertyEditorManifests } from './property-editors/manifests';
-import { manifests as modalManifests } from './components/modal/common/manifests';
+import { manifests as modalManifests } from './modal/common/manifests';
+import { UmbStoreExtensionInitializer } from './store';
 
-import { UmbBackofficeNotificationContainerElement } from './components/backoffice-notification-container/backoffice-notification-container.element';
-import { UmbBackofficeModalContainerElement } from './components/backoffice-modal-container/backoffice-modal-container.element';
-
-import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from 'src/packages/core/notification';
+import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/notification';
 import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/modal';
 import { UmbContextProviderController } from '@umbraco-cms/backoffice/context-api';
 import type { UmbEntryPointOnInit } from '@umbraco-cms/backoffice/extension-api';

src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/icon-picker/property-editor-ui-icon-picker.stories.ts

@@ -1,8 +1,7 @@
 import { Meta, Story } from '@storybook/web-components';
 import { html } from 'lit';
 
-import type { UmbIconPickerModalElement } from '../../../components/modal/common/icon-picker/icon-picker-modal.element';
-import type { UmbPropertyEditorUIIconPickerElement } from './property-editor-ui-icon-picker.element';
+import type { UmbIconPickerModalElement } from '../../../modal/common/icon-picker/icon-picker-modal.element';
 import './property-editor-ui-icon-picker.element';
 
 export default {

src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/workspace-entity-context.interface.ts

@@ -1,4 +1,4 @@
-import type { UmbWorkspaceContextInterface } from 'src/packages/core/workspace';
+import type { UmbWorkspaceContextInterface } from './workspace-context.interface';
 
 export interface UmbEntityWorkspaceContextInterface<EntityType = unknown>
 	extends UmbWorkspaceContextInterface<EntityType> {

src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/workspace-variable-entity-context.interface.ts

@@ -1,6 +1,7 @@
 import type { Observable } from 'rxjs';
+import type { UmbWorkspaceSplitViewManager } from '../workspace-split-view-manager.class';
+import type { UmbEntityWorkspaceContextInterface } from './workspace-entity-context.interface';
 import { UmbVariantId } from '@umbraco-cms/backoffice/variant';
-import type { UmbEntityWorkspaceContextInterface, UmbWorkspaceSplitViewManager } from 'src/packages/core/workspace';
 import type { ValueModelBaseModel, VariantResponseModelBaseModel } from '@umbraco-cms/backoffice/backend-api';
 
 export interface UmbWorkspaceVariableEntityContextInterface<T = unknown> extends UmbEntityWorkspaceContextInterface<T> {

src/Umbraco.Web.UI.Client/src/packages/translation/modals/dictionary-item-picker/dictionary-item-picker-modal.element.ts

@@ -1,7 +1,7 @@
 import { UUITextStyles } from '@umbraco-ui/uui-css';
 import { css, html } from 'lit';
 import { customElement, state } from 'lit/decorators.js';
-import { UmbTreeElement } from '../../../core/components/tree/tree.element';
+import { UmbTreeElement } from '@umbraco-cms/backoffice/tree';
 import { UmbModalBaseElement } from '@umbraco-cms/internal/modal';
 import { UmbDictionaryItemPickerModalData, UmbDictionaryItemPickerModalResult } from '@umbraco-cms/backoffice/modal';
 

src/Umbraco.Web.UI.Client/src/packages/users/users/workspace/manifests.ts

@@ -3,7 +3,7 @@ import type {
 	ManifestWorkspace,
 	ManifestWorkspaceAction,
 	ManifestWorkspaceEditorView,
-} from '@umbraco-cms/backoffice/workspace';
+} from '@umbraco-cms/backoffice/extension-registry';
 
 const workspace: ManifestWorkspace = {
 	type: 'workspace',