change imports

src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/data-type-workspace.context.ts

@@ -2,7 +2,7 @@ import { UmbWorkspaceContentContext } from '../../../shared/components/workspace
 import type { UmbDataTypeStore, UmbDataTypeStoreItemType } from 'src/backoffice/settings/data-types/data-type.store';
 import type { DataTypeDetails } from '@umbraco-cms/models';
 import { UmbControllerHostInterface } from 'src/core/controller/controller-host.mixin';
-import { appendToFrozenArray } from 'src/core/observable-api/unique-behavior-subject';
+import { appendToFrozenArray } from '@umbraco-cms/observable-api';
 
 const DefaultDataTypeData = {
 	key: '',

src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/collection.context.ts

@@ -1,15 +1,13 @@
 import { ContentTreeItem } from '@umbraco-cms/backend-api';
 import { UmbTreeDataStore } from '@umbraco-cms/stores/store';
-import { UmbControllerHostInterface } from 'src/core/controller/controller-host.mixin';
-import { UmbContextConsumerController } from 'src/core/context-api/consume/context-consumer.controller';
-import { UmbObserverController } from 'src/core/observable-api/observer.controller';
-import { UniqueBehaviorSubject } from 'src/core/observable-api/unique-behavior-subject';
-
+import { UmbControllerHostInterface } from '@umbraco-cms/controller';
+import { UmbContextConsumerController } from '@umbraco-cms/context-api';
+import { UniqueBehaviorSubject, UmbObserverController } from '@umbraco-cms/observable-api';
 export class UmbCollectionContext<
 	DataType extends ContentTreeItem,
 	StoreType extends UmbTreeDataStore<DataType> = UmbTreeDataStore<DataType>
 > {
-	
+
 	private _host: UmbControllerHostInterface;
 	private _entityKey: string | null;
 

src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section.context.ts

@@ -1,6 +1,6 @@
 import { BehaviorSubject } from 'rxjs';
 import type { Entity, ManifestSection, ManifestSectionView, ManifestTree } from '@umbraco-cms/models';
-import { UniqueBehaviorSubject } from 'src/core/observable-api/unique-behavior-subject';
+import { UniqueBehaviorSubject } from '@umbraco-cms/observable-api';
 
 export class UmbSectionContext {
 

src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/context-menu/tree-context-menu-page.service.ts

@@ -3,7 +3,7 @@ import { css, nothing, PropertyValueMap } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
 import UmbTreeItemActionElement, { ActionPageEntity } from '../action/tree-item-action.element';
 import { UmbLitElement } from '@umbraco-cms/element';
-import { UniqueBehaviorSubject } from 'src/core/observable-api/unique-behavior-subject';
+import { UniqueBehaviorSubject } from '@umbraco-cms/observable-api';
 
 // TODO: Refactor this, its not a service and the data should be handled by a context api.
 @customElement('umb-tree-context-menu-page-service')

src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree.context.ts

@@ -1,6 +1,6 @@
 import type { Observable } from 'rxjs';
 import type { ManifestTree } from '@umbraco-cms/models';
-import { UniqueBehaviorSubject } from 'src/core/observable-api/unique-behavior-subject';
+import { UniqueBehaviorSubject } from '@umbraco-cms/observable-api';
 
 export interface UmbTreeContext {
 	tree: ManifestTree;

src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/workspace-content.context.ts

@@ -2,12 +2,11 @@ import { v4 as uuidv4 } from 'uuid';
 import { UmbNotificationService } from '../../../../../core/notification';
 import { UmbNotificationDefaultData } from '../../../../../core/notification/layouts/default';
 import { UmbNodeStoreBase } from '@umbraco-cms/stores/store';
-import { UmbControllerHostInterface } from 'src/core/controller/controller-host.mixin';
-import { UmbContextConsumerController } from 'src/core/context-api/consume/context-consumer.controller';
+import { UmbControllerHostInterface } from '@umbraco-cms/controller';
+import { UmbContextConsumerController, UmbContextProviderController } from '@umbraco-cms/context-api';
 import { UmbObserverController } from '@umbraco-cms/observable-api';
-import { UmbContextProviderController } from 'src/core/context-api/provide/context-provider.controller';
 import { EntityTreeItem } from '@umbraco-cms/backend-api';
-import { createObservablePart, UniqueBehaviorSubject } from 'src/core/observable-api/unique-behavior-subject';
+import { createObservablePart, UniqueBehaviorSubject } from '@umbraco-cms/observable-api';
 
 // TODO: Consider if its right to have this many class-inheritance of WorkspaceContext
 // TODO: Could we extract this code into a 'Manager' of its own, which will be instantiated by the concrete Workspace Context. This will be more transparent and 'reuseable'

src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/shared/property-action-menu/property-action-menu.context.ts

@@ -1,6 +1,6 @@
 import { UmbContextProviderController } from 'src/core/context-api/provide/context-provider.controller';
 import type { UmbControllerHostInterface } from 'src/core/controller/controller-host.mixin';
-import { UniqueBehaviorSubject } from 'src/core/observable-api/unique-behavior-subject';
+import { UniqueBehaviorSubject } from '@umbraco-cms/observable-api';
 
 export class UmbPropertyActionMenuContext {
 

src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/current-user-history.store.ts

@@ -1,4 +1,4 @@
-import { createObservablePart, UniqueBehaviorSubject } from 'src/core/observable-api/unique-behavior-subject';
+import { createObservablePart, UniqueBehaviorSubject } from '@umbraco-cms/observable-api';
 
 export type UmbModelType = 'dialog' | 'sidebar';
 

src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/section-view-users.element.ts

@@ -12,7 +12,7 @@ import type { ManifestWorkspace, UserDetails } from '@umbraco-cms/models';
 import { UmbUserStore } from 'src/backoffice/users/users/user.store';
 import { createExtensionElement } from '@umbraco-cms/extensions-api';
 import { UmbLitElement } from '@umbraco-cms/element';
-import { UniqueBehaviorSubject } from 'src/core/observable-api/unique-behavior-subject';
+import { UniqueBehaviorSubject } from '@umbraco-cms/observable-api';
 
 @customElement('umb-section-view-users')
 export class UmbSectionViewUsersElement extends UmbLitElement {

src/Umbraco.Web.UI.Client/src/backoffice/users/users/user.store.ts

@@ -1,7 +1,7 @@
 import { map, Observable } from 'rxjs';
 import { UmbDataStoreBase } from '../../../core/stores/store';
 import type { UserDetails } from '@umbraco-cms/models';
-import { UniqueBehaviorSubject } from 'src/core/observable-api/unique-behavior-subject';
+import { UniqueBehaviorSubject } from '@umbraco-cms/observable-api';
 
 export type UmbUserStoreItemType = UserDetails;
 

src/Umbraco.Web.UI.Client/src/core/context-api/index.ts

@@ -1,4 +1,6 @@
+export * from './consume/context-consumer.controller';
 export * from './consume/context-consumer';
 export * from './consume/context-request.event';
+export * from './provide/context-provider.controller';
 export * from './provide/context-provider';
 export * from './provide/context-provide.event';

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

@@ -0,0 +1,3 @@
+export * from './controller-host.mixin';
+export * from './controller.class';
+export * from './controller.interface';

src/Umbraco.Web.UI.Client/tsconfig.json

@@ -23,6 +23,7 @@
 			"@umbraco-cms/models": ["src/core/models"],
 			"@umbraco-cms/backend-api": ["src/core/backend-api"],
 			"@umbraco-cms/context-api": ["src/core/context-api"],
+			"@umbraco-cms/controller": ["src/core/controller"],
 			"@umbraco-cms/element": ["src/core/element"],
 			"@umbraco-cms/extensions-api": ["src/core/extensions-api"],
 			"@umbraco-cms/extensions-registry": ["src/core/extensions-registry"],

src/Umbraco.Web.UI.Client/web-test-runner.config.mjs

@@ -14,6 +14,7 @@ export default {
 						'@umbraco-cms/models': './src/core/models/index.ts',
 						'@umbraco-cms/backend-api': './src/core/backend-api/index.ts',
 						'@umbraco-cms/context-api': './src/core/context-api/index.ts',
+						'@umbraco-cms/controller': './src/core/controller/index.ts',
 						'@umbraco-cms/element': './src/core/element/index.ts',
 						'@umbraco-cms/extensions-api': './src/core/extensions-api/index.ts',
 						'@umbraco-cms/observable-api': './src/core/observable-api/index.ts',