diff --git a/src/Umbraco.Web.UI.Client/external/openid/index.ts b/src/Umbraco.Web.UI.Client/external/openid/index.ts new file mode 100644 index 0000000000..baaee116db --- /dev/null +++ b/src/Umbraco.Web.UI.Client/external/openid/index.ts @@ -0,0 +1,17 @@ +export { + BaseTokenRequestHandler, + BasicQueryStringUtils, + FetchRequestor, + LocalStorageBackend, + RedirectRequestHandler, +} from '@openid/appauth'; +export { AuthorizationRequest } from '@openid/appauth/built/authorization_request'; +export { AuthorizationNotifier } from '@openid/appauth/built/authorization_request_handler'; +export { AuthorizationServiceConfiguration } from '@openid/appauth/built/authorization_service_configuration'; +export { + GRANT_TYPE_AUTHORIZATION_CODE, + GRANT_TYPE_REFRESH_TOKEN, + TokenRequest, +} from '@openid/appauth/built/token_request'; +export { TokenResponse } from '@openid/appauth/built/token_response'; +export type { LocationLike, StringMap } from '@openid/appauth/built/types'; diff --git a/src/Umbraco.Web.UI.Client/external/rollup.config.js b/src/Umbraco.Web.UI.Client/external/rollup.config.js index 64694fc3d9..cf1054abe0 100644 --- a/src/Umbraco.Web.UI.Client/external/rollup.config.js +++ b/src/Umbraco.Web.UI.Client/external/rollup.config.js @@ -14,4 +14,28 @@ export default [ }, plugins: [nodeResolve(), commonjs(), esbuild()], }, + { + input: './external/openid/index.ts', + output: { + dir: `./dist-cms/external/openid`, + format: 'es', + }, + plugins: [nodeResolve(), commonjs(), esbuild()], + }, + { + input: './external/rxjs/index.ts', + output: { + dir: `./dist-cms/external/rxjs`, + format: 'es', + }, + plugins: [nodeResolve(), commonjs(), esbuild()], + }, + { + input: './external/router-slot/index.ts', + output: { + dir: `./dist-cms/external/router-slot`, + format: 'es', + }, + plugins: [nodeResolve(), commonjs(), esbuild()], + }, ]; diff --git a/src/Umbraco.Web.UI.Client/external/router-slot/index.ts b/src/Umbraco.Web.UI.Client/external/router-slot/index.ts new file mode 100644 index 0000000000..592a0553a8 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/external/router-slot/index.ts @@ -0,0 +1,2 @@ +export type * from 'router-slot/model'; +export * from 'router-slot/util'; diff --git a/src/Umbraco.Web.UI.Client/external/rxjs/index.ts b/src/Umbraco.Web.UI.Client/external/rxjs/index.ts new file mode 100644 index 0000000000..66eddd1fb0 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/external/rxjs/index.ts @@ -0,0 +1,16 @@ +export { + ReplaySubject, + Subject, + Observable, + BehaviorSubject, + Subscription, + map, + distinctUntilChanged, + combineLatest, + shareReplay, + takeUntil, + debounceTime, + tap, + of, + lastValueFrom, +} from 'rxjs'; diff --git a/src/Umbraco.Web.UI.Client/src/apps/app/auth/auth-flow.ts b/src/Umbraco.Web.UI.Client/src/apps/app/auth/auth-flow.ts index 3ba33d0c15..191a61aafa 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/app/auth/auth-flow.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/app/auth/auth-flow.ts @@ -19,17 +19,16 @@ import { FetchRequestor, LocalStorageBackend, RedirectRequestHandler, -} from '@openid/appauth'; -import { AuthorizationRequest } from '@openid/appauth/built/authorization_request'; -import { AuthorizationNotifier } from '@openid/appauth/built/authorization_request_handler'; -import { AuthorizationServiceConfiguration } from '@openid/appauth/built/authorization_service_configuration'; -import { + AuthorizationRequest, + AuthorizationNotifier, + AuthorizationServiceConfiguration, GRANT_TYPE_AUTHORIZATION_CODE, GRANT_TYPE_REFRESH_TOKEN, TokenRequest, -} from '@openid/appauth/built/token_request'; -import { TokenResponse } from '@openid/appauth/built/token_response'; -import { LocationLike, StringMap } from '@openid/appauth/built/types'; + TokenResponse, + LocationLike, + StringMap, +} from '@umbraco-cms/backoffice/external/openid'; const requestor = new FetchRequestor(); diff --git a/src/Umbraco.Web.UI.Client/src/apps/backoffice/extension.controller.ts b/src/Umbraco.Web.UI.Client/src/apps/backoffice/extension.controller.ts index 147d428101..95611d9782 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/backoffice/extension.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/backoffice/extension.controller.ts @@ -1,7 +1,7 @@ -import { Subject } from 'rxjs'; +import { Subject } from '@umbraco-cms/backoffice/external/rxjs'; +import { PackageResource, OpenAPI } from '@umbraco-cms/backoffice/backend-api'; import { UmbController, UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; import { UmbBackofficeExtensionRegistry } from '@umbraco-cms/backoffice/extension-registry'; -import { PackageResource, OpenAPI } from '@umbraco-cms/backoffice/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import { ManifestBase, isManifestJSType } from '@umbraco-cms/backoffice/extension-api'; diff --git a/src/Umbraco.Web.UI.Client/src/apps/installer/installer.context.ts b/src/Umbraco.Web.UI.Client/src/apps/installer/installer.context.ts index f86701d737..d81b13b572 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/installer/installer.context.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/installer/installer.context.ts @@ -1,4 +1,4 @@ -import { Observable } from 'rxjs'; +import type { Observable } from '@umbraco-cms/backoffice/external/rxjs'; import { InstallVResponseModel, InstallResource, diff --git a/src/Umbraco.Web.UI.Client/src/libs/element-api/element.mixin.ts b/src/Umbraco.Web.UI.Client/src/libs/element-api/element.mixin.ts index 6b787369b0..be446eb6e0 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/element-api/element.mixin.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/element-api/element.mixin.ts @@ -1,4 +1,4 @@ -import { Observable } from 'rxjs'; +import type { Observable } from '@umbraco-cms/backoffice/external/rxjs'; import type { HTMLElementConstructor } from '@umbraco-cms/backoffice/extension-api'; import { UmbControllerHostElement, UmbControllerHostMixin } from '@umbraco-cms/backoffice/controller-api'; import { diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/registry/extension.registry.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/registry/extension.registry.ts index e08b64c052..a9f75335cf 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/registry/extension.registry.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/registry/extension.registry.ts @@ -1,4 +1,10 @@ -import { BehaviorSubject, map, Observable, distinctUntilChanged, combineLatest } from 'rxjs'; +import { + BehaviorSubject, + map, + Observable, + distinctUntilChanged, + combineLatest, +} from '@umbraco-cms/backoffice/external/rxjs'; import type { ManifestTypeMap, ManifestBase, SpecificManifestTypeOrManifestBase, ManifestKind } from '../types.js'; function extensionArrayMemoization( diff --git a/src/Umbraco.Web.UI.Client/src/libs/observable-api/basic-state.ts b/src/Umbraco.Web.UI.Client/src/libs/observable-api/basic-state.ts index 30972d0ef4..2090ed0a77 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/observable-api/basic-state.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/observable-api/basic-state.ts @@ -1,4 +1,4 @@ -import { BehaviorSubject } from 'rxjs'; +import { BehaviorSubject } from '@umbraco-cms/backoffice/external/rxjs'; /** * @export diff --git a/src/Umbraco.Web.UI.Client/src/libs/observable-api/class-state.ts b/src/Umbraco.Web.UI.Client/src/libs/observable-api/class-state.ts index 586710e38b..6196c31822 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/observable-api/class-state.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/observable-api/class-state.ts @@ -1,4 +1,4 @@ -import { BehaviorSubject } from 'rxjs'; +import { BehaviorSubject } from '@umbraco-cms/backoffice/external/rxjs'; interface UmbClassStateData { equal(otherClass: UmbClassStateData): boolean; diff --git a/src/Umbraco.Web.UI.Client/src/libs/observable-api/create-observable-part.function.ts b/src/Umbraco.Web.UI.Client/src/libs/observable-api/create-observable-part.function.ts index 6eaa2db8d5..ab5ee5abd9 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/observable-api/create-observable-part.function.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/observable-api/create-observable-part.function.ts @@ -1,4 +1,4 @@ -import { distinctUntilChanged, map, Observable, shareReplay } from 'rxjs'; +import { distinctUntilChanged, map, Observable, shareReplay } from '@umbraco-cms/backoffice/external/rxjs'; import { MemoizationFunction } from './memoization-function.js'; import { MappingFunction } from './mapping-function.js'; import { defaultMemoization } from './default-memoization.js'; diff --git a/src/Umbraco.Web.UI.Client/src/libs/observable-api/deep-state.ts b/src/Umbraco.Web.UI.Client/src/libs/observable-api/deep-state.ts index 31bb3b194a..70163575c7 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/observable-api/deep-state.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/observable-api/deep-state.ts @@ -1,4 +1,4 @@ -import { BehaviorSubject } from 'rxjs'; +import { BehaviorSubject } from '@umbraco-cms/backoffice/external/rxjs'; import { createObservablePart } from './create-observable-part.function.js'; import { deepFreeze } from './deep-freeze.function.js'; import type { MappingFunction } from './mapping-function.js'; diff --git a/src/Umbraco.Web.UI.Client/src/libs/observable-api/observer.controller.ts b/src/Umbraco.Web.UI.Client/src/libs/observable-api/observer.controller.ts index ab12a55e60..86437e74de 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/observable-api/observer.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/observable-api/observer.controller.ts @@ -1,4 +1,4 @@ -import { Observable } from 'rxjs'; +import { Observable } from '@umbraco-cms/backoffice/external/rxjs'; import { UmbObserver } from './observer.js'; import { UmbControllerInterface, UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; diff --git a/src/Umbraco.Web.UI.Client/src/libs/observable-api/observer.ts b/src/Umbraco.Web.UI.Client/src/libs/observable-api/observer.ts index eafe8e7f2c..68ff9088b3 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/observable-api/observer.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/observable-api/observer.ts @@ -1,4 +1,4 @@ -import { Observable, Subscription, lastValueFrom } from 'rxjs'; +import { Observable, Subscription, lastValueFrom } from '@umbraco-cms/backoffice/external/rxjs'; export class UmbObserver { #source!: Observable; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-selection-actions.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-selection-actions.element.ts index 08d8a8b71a..4867571621 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-selection-actions.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-selection-actions.element.ts @@ -1,7 +1,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css'; import { css, html, nothing } from 'lit'; import { customElement, state } from 'lit/decorators.js'; -import { map } from 'rxjs'; +import { map } from '@umbraco-cms/backoffice/external/rxjs'; import { UMB_COLLECTION_CONTEXT_TOKEN, UmbCollectionContext } from '@umbraco-cms/backoffice/collection'; import { ManifestEntityBulkAction, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-toolbar.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-toolbar.element.ts index 1482b54eaf..69f6226682 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-toolbar.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-toolbar.element.ts @@ -1,7 +1,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css'; import { css, html, nothing } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; -import { map } from 'rxjs'; +import { map } from '@umbraco-cms/backoffice/external/rxjs'; import type { TooltipMenuItem } from '../components/tooltip-menu/index.js'; import { ManifestCollectionView, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection.element.ts index ab4c9a964c..33924d07d3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection.element.ts @@ -1,7 +1,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css'; import { css, html, nothing } from 'lit'; import { customElement, state, property } from 'lit/decorators.js'; -import { map } from 'rxjs'; +import { map } from '@umbraco-cms/backoffice/external/rxjs'; import './collection-selection-actions.element'; import './collection-toolbar.element'; import { UmbCollectionContext, UMB_COLLECTION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/collection'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/extension-slot/extension-slot.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/extension-slot/extension-slot.element.ts index 45fab5f28a..554c9980dc 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/extension-slot/extension-slot.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/extension-slot/extension-slot.element.ts @@ -2,7 +2,7 @@ import { css, nothing } from 'lit'; import type { TemplateResult } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; -import { map } from 'rxjs'; +import { map } from '@umbraco-cms/backoffice/external/rxjs'; import { repeat } from 'lit/directives/repeat.js'; import { createExtensionElement, isManifestElementableType } from '@umbraco-cms/backoffice/extension-api'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action-list.element.ts index 7a2145c238..f7ab4e3b57 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action-list.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action-list.element.ts @@ -1,6 +1,6 @@ import { html } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; -import { map } from 'rxjs'; +import { map } from '@umbraco-cms/backoffice/external/rxjs'; import { ManifestEntityAction, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu-item-base/menu-item-base.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu-item-base/menu-item-base.element.ts index 736b113bfd..a1fafc8e97 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu-item-base/menu-item-base.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu-item-base/menu-item-base.element.ts @@ -2,7 +2,7 @@ import { css, html, nothing } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css'; import { customElement, property, state } from 'lit/decorators.js'; import { ifDefined } from 'lit/directives/if-defined.js'; -import { map } from 'rxjs'; +import { map } from '@umbraco-cms/backoffice/external/rxjs'; import { UmbSectionSidebarContext, UMB_SECTION_SIDEBAR_CONTEXT_TOKEN, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-handler.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-handler.ts index 786cf16bc5..44bf43b518 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-handler.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-handler.ts @@ -1,12 +1,12 @@ // eslint-disable-next-line local-rules/no-external-imports -import type { IRouterSlot } from 'router-slot/model'; +import type { IRouterSlot } from '@umbraco-cms/backoffice/external/router-slot'; import type { UUIDialogElement, UUIModalDialogElement, UUIModalSidebarElement, UUIModalSidebarSize, } from '@umbraco-ui/uui'; -import { BehaviorSubject } from 'rxjs'; +import { BehaviorSubject } from '@umbraco-cms/backoffice/external/rxjs'; import { UmbModalConfig, UmbModalType } from './modal.context.js'; import { UmbModalToken } from './token/modal-token.js'; import { ManifestModal, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-route-registration.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-route-registration.ts index 21d0d782e4..79170f8c1a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-route-registration.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-route-registration.ts @@ -1,5 +1,5 @@ // eslint-disable-next-line local-rules/no-external-imports -import type { IRouterSlot } from 'router-slot/model'; +import type { IRouterSlot } from '@umbraco-cms/backoffice/external/router-slot'; import { UmbModalHandler } from './modal-handler.js'; import { UmbModalConfig, UmbModalContext } from './modal.context.js'; import { UmbModalToken } from './token/modal-token.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal.context.ts index 7fde83d56a..2bc1b80c0c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal.context.ts @@ -1,7 +1,7 @@ // eslint-disable-next-line local-rules/no-external-imports -import type { IRouterSlot } from 'router-slot/model'; +import type { IRouterSlot } from '@umbraco-cms/backoffice/external/router-slot'; import type { UUIModalSidebarSize } from '@umbraco-ui/uui'; -import { BehaviorSubject } from 'rxjs'; +import { BehaviorSubject } from '@umbraco-cms/backoffice/external/rxjs'; import { UmbModalHandler, UmbModalHandlerClass } from './modal-handler.js'; import type { UmbModalToken } from './token/modal-token.js'; import { appendToFrozenArray } from '@umbraco-cms/backoffice/observable-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/create-dictionary-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/create-dictionary-modal.token.ts index 8767cf9c08..cd2823651e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/create-dictionary-modal.token.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/create-dictionary-modal.token.ts @@ -1,4 +1,4 @@ -import { Observable } from 'rxjs'; +import { Observable } from '@umbraco-cms/backoffice/external/rxjs'; import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; export interface UmbCreateDictionaryModalData { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/notification/notification.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/notification/notification.context.ts index 75db01fe7e..9605cf3ca6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/notification/notification.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/notification/notification.context.ts @@ -1,4 +1,4 @@ -import { BehaviorSubject } from 'rxjs'; +import { BehaviorSubject } from '@umbraco-cms/backoffice/external/rxjs'; import { UmbNotificationHandler } from './notification-handler.js'; import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-actions/shared/property-action-menu/property-action-menu.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-actions/shared/property-action-menu/property-action-menu.element.ts index 4501ee3516..60fb55df58 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-actions/shared/property-action-menu/property-action-menu.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-actions/shared/property-action-menu/property-action-menu.element.ts @@ -1,6 +1,6 @@ import { css, CSSResultGroup, html } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; -import { map } from 'rxjs'; +import { map } from '@umbraco-cms/backoffice/external/rxjs'; import { UUITextStyles } from '@umbraco-ui/uui'; import { UmbPropertyActionMenuContext } from './property-action-menu.context.js'; import { ManifestPropertyAction, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/section/section-default.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/section/section-default.element.ts index fd3051cf53..2dfb480d51 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/section/section-default.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/section/section-default.element.ts @@ -1,7 +1,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css'; import { css, html, nothing } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; -import { map } from 'rxjs'; +import { map } from '@umbraco-cms/backoffice/external/rxjs'; import type { UmbWorkspaceElement } from '../workspace/workspace.element.js'; import type { UmbSectionViewsElement } from './section-views/section-views.element.js'; import { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/section/section-views/section-views.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/section/section-views/section-views.element.ts index 577dab20b3..198a0be1ac 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/section/section-views/section-views.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/section/section-views/section-views.element.ts @@ -1,7 +1,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css'; import { css, html, nothing } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; -import { map, of } from 'rxjs'; +import { map, of } from '@umbraco-cms/backoffice/external/rxjs'; import { UmbSectionContext, UMB_SECTION_CONTEXT_TOKEN } from '../section.context.js'; import type { UmbRoute, UmbRouterSlotChangeEvent, UmbRouterSlotInitEvent } from '@umbraco-cms/backoffice/router'; import { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/store/item-store.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/store/item-store.interface.ts index 5e633ff54a..d3ced826d7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/store/item-store.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/store/item-store.interface.ts @@ -1,4 +1,4 @@ -import type { Observable } from 'rxjs'; +import type { Observable } from '@umbraco-cms/backoffice/external/rxjs'; import { ItemResponseModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; import { UmbStore } from './store.interface.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/store/store.ts b/src/Umbraco.Web.UI.Client/src/packages/core/store/store.ts index b2c48aedde..03e73c7cc7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/store/store.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/store/store.ts @@ -1,5 +1,5 @@ // TODO: delete when the last usages are gone -import type { Observable } from 'rxjs'; +import type { Observable } from '@umbraco-cms/backoffice/external/rxjs'; export interface UmbDataStoreIdentifiers { key?: string; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/store/tree-store.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/store/tree-store.interface.ts index 4a5e465d02..2d3fc45c06 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/store/tree-store.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/store/tree-store.interface.ts @@ -1,4 +1,4 @@ -import type { Observable } from 'rxjs'; +import type { Observable } from '@umbraco-cms/backoffice/external/rxjs'; import { TreeItemPresentationModel } from '@umbraco-cms/backoffice/backend-api'; import { UmbStore } from './store.interface.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-base/tree-item-base.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-base/tree-item-base.context.ts index 1a65810082..5d203be7eb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-base/tree-item-base.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-base/tree-item-base.context.ts @@ -1,4 +1,4 @@ -import { map } from 'rxjs'; +import { map } from '@umbraco-cms/backoffice/external/rxjs'; import { UmbTreeItemContext } from '../tree-item/tree-item.context.interface.js'; import { UmbTreeContextBase } from '../tree.context.js'; import { UMB_SECTION_CONTEXT_TOKEN, UMB_SECTION_SIDEBAR_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/section'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item.context.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item.context.interface.ts index bafa484a6e..ec71a13e9b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item.context.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item.context.interface.ts @@ -1,4 +1,4 @@ -import type { Observable } from 'rxjs'; +import type { Observable } from '@umbraco-cms/backoffice/external/rxjs'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; import type { ProblemDetailsModel, TreeItemPresentationModel } from '@umbraco-cms/backoffice/backend-api'; import { UmbPagedData } from '@umbraco-cms/backoffice/repository'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.context.ts index a974eb1827..eb9b8dbbcc 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.context.ts @@ -1,4 +1,4 @@ -import { Observable, map } from 'rxjs'; +import { Observable, map } from '@umbraco-cms/backoffice/external/rxjs'; import { UmbPagedData, UmbTreeRepository } from '@umbraco-cms/backoffice/repository'; import { ManifestTree, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { UmbBooleanState, UmbObserverController } from '@umbraco-cms/backoffice/observable-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/workspace-context.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/workspace-context.interface.ts index 0c3e6255ab..29d991ccc3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/workspace-context.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/workspace-context.interface.ts @@ -1,4 +1,4 @@ -import { Observable } from 'rxjs'; +import { Observable } from '@umbraco-cms/backoffice/external/rxjs'; import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; export interface UmbWorkspaceContextInterface { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/workspace-invariantable-entity-context.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/workspace-invariantable-entity-context.interface.ts index 1280c436a5..85e9bffe23 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/workspace-invariantable-entity-context.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/workspace-invariantable-entity-context.interface.ts @@ -1,4 +1,4 @@ -import type { Observable } from 'rxjs'; +import type { Observable } from '@umbraco-cms/backoffice/external/rxjs'; import type { UmbEntityWorkspaceContextInterface } from './workspace-entity-context.interface.js'; import type { ValueModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/workspace-variable-entity-context.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/workspace-variable-entity-context.interface.ts index 6b84372677..245dd5aadc 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/workspace-variable-entity-context.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/workspace-variable-entity-context.interface.ts @@ -1,4 +1,4 @@ -import type { Observable } from 'rxjs'; +import type { Observable } from '@umbraco-cms/backoffice/external/rxjs'; import type { UmbWorkspaceSplitViewManager } from '../workspace-split-view-manager.class.js'; import type { UmbEntityWorkspaceContextInterface } from './workspace-entity-context.interface.js'; import { UmbVariantId } from '@umbraco-cms/backoffice/variant'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-editor/workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-editor/workspace-editor.element.ts index 4ae997d728..2d67988017 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-editor/workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-editor/workspace-editor.element.ts @@ -1,9 +1,14 @@ import { UUITextStyles } from '@umbraco-ui/uui-css'; import { css, html, nothing } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; -import { map } from 'rxjs'; +import { map } from '@umbraco-cms/backoffice/external/rxjs'; import { repeat } from 'lit/directives/repeat.js'; -import type { PageComponent, UmbRoute, UmbRouterSlotInitEvent, UmbRouterSlotChangeEvent } from '@umbraco-cms/backoffice/router'; +import type { + PageComponent, + UmbRoute, + UmbRouterSlotInitEvent, + UmbRouterSlotChangeEvent, +} from '@umbraco-cms/backoffice/router'; import { ManifestWorkspaceEditorView, ManifestWorkspaceViewCollection, diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/members/member.detail.store.ts b/src/Umbraco.Web.UI.Client/src/packages/members/members/member.detail.store.ts index 980fecbed5..0bda3a5eec 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/members/member.detail.store.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/members/member.detail.store.ts @@ -1,4 +1,4 @@ -import { Observable } from 'rxjs'; +import { Observable } from '@umbraco-cms/backoffice/external/rxjs'; import { umbMemberData } from '../../../mocks/data/member.data.js'; import type { MemberDetails } from './types.js'; import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view-item.element.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view-item.element.ts index 93ec279469..8e9ff153eb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view-item.element.ts @@ -2,7 +2,7 @@ import { html, css, nothing } from 'lit'; import { ifDefined } from 'lit/directives/if-defined.js'; import { customElement, property, state } from 'lit/decorators.js'; import { UUIButtonState } from '@umbraco-ui/uui'; -import { map } from 'rxjs'; +import { map } from '@umbraco-cms/backoffice/external/rxjs'; import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN, UMB_CONFIRM_MODAL } from '@umbraco-cms/backoffice/modal'; import { createExtensionElement } from '@umbraco-cms/backoffice/extension-api'; import { ManifestPackageView, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view.element.ts index 78daf88290..ca473d952b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view.element.ts @@ -1,7 +1,7 @@ import { html, css } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { repeat } from 'lit/directives/repeat.js'; -import { combineLatest } from 'rxjs'; +import { combineLatest } from '@umbraco-cms/backoffice/external/rxjs'; import { UUITextStyles } from '@umbraco-ui/uui-css'; import { UmbPackageRepository } from '../../../repository/package.repository.js'; import type { UmbPackageWithMigrationStatus } from '../../../types.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/repository/package.store.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/repository/package.store.ts index 51c183b429..7f4ca93cb1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/packages/repository/package.store.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/packages/repository/package.store.ts @@ -1,4 +1,4 @@ -import { ReplaySubject } from 'rxjs'; +import { ReplaySubject } from '@umbraco-cms/backoffice/external/rxjs'; import type { UmbPackage } from '../types.js'; import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/repository/server-extension.controller.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/repository/server-extension.controller.ts index 907f94fbf9..2feca614d6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/packages/repository/server-extension.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/packages/repository/server-extension.controller.ts @@ -1,4 +1,4 @@ -import { Subject, takeUntil } from 'rxjs'; +import { Subject, takeUntil } from '@umbraco-cms/backoffice/external/rxjs'; import { UmbPackageRepository } from './package.repository.js'; import { UmbController, UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; import { UmbBackofficeExtensionRegistry } from '@umbraco-cms/backoffice/extension-registry'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/health-check/health-check.context.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/health-check/health-check.context.ts index 65b48913dd..ad1c9cff8b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/health-check/health-check.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/health-check/health-check.context.ts @@ -1,4 +1,4 @@ -import { BehaviorSubject } from 'rxjs'; +import { BehaviorSubject } from '@umbraco-cms/backoffice/external/rxjs'; import { HealthCheckGroupPresentationModel, HealthCheckGroupWithResultResponseModel, diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/extensions/workspace/extension-root-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/extensions/workspace/extension-root-workspace.element.ts index 5d9735ab99..b34cd14d76 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/extensions/workspace/extension-root-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/extensions/workspace/extension-root-workspace.element.ts @@ -1,6 +1,6 @@ import { css, html } from 'lit'; import { customElement, state } from 'lit/decorators.js'; -import { map } from 'rxjs'; +import { map } from '@umbraco-cms/backoffice/external/rxjs'; import { isManifestElementNameType } from '@umbraco-cms/backoffice/extension-api'; import { ManifestTypes, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/logviewer-root/logviewer-root-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/logviewer-root/logviewer-root-workspace.element.ts index 031cdd677c..ccf9f2e20d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/logviewer-root/logviewer-root-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/logviewer-root/logviewer-root-workspace.element.ts @@ -1,5 +1,5 @@ import './components'; -import { map } from 'rxjs'; +import { map } from '@umbraco-cms/backoffice/external/rxjs'; import { PropertyValueMap, css, html, nothing } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/views/search/components/log-viewer-search-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/views/search/components/log-viewer-search-input.element.ts index 2e7a8bcc40..ac4082d274 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/views/search/components/log-viewer-search-input.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/views/search/components/log-viewer-search-input.element.ts @@ -2,7 +2,7 @@ import { UUIButtonElement, UUIInputElement, UUIPopoverElement, UUISymbolExpandEl import { UUITextStyles } from '@umbraco-ui/uui-css'; import { css, html } from 'lit'; import { customElement, query, state } from 'lit/decorators.js'; -import { Subject, debounceTime, tap } from 'rxjs'; +import { Subject, debounceTime, tap } from '@umbraco-cms/backoffice/external/rxjs'; import { UmbLogViewerWorkspaceContext, UMB_APP_LOG_VIEWER_CONTEXT_TOKEN } from '../../../logviewer.context.js'; import { SavedLogSearchResponseModel } from '@umbraco-cms/backoffice/backend-api'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/themes/theme.context.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/themes/theme.context.ts index ba50ee5b53..d77c30f894 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/themes/theme.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/themes/theme.context.ts @@ -1,4 +1,4 @@ -import { map } from 'rxjs'; +import { map } from '@umbraco-cms/backoffice/external/rxjs'; import { manifests } from './manifests.js'; import { UmbContextProviderController, UmbContextToken } from '@umbraco-cms/backoffice/context-api'; import { UmbStringState, UmbObserverController } from '@umbraco-cms/backoffice/observable-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/repository/partial-views.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/repository/partial-views.repository.ts index 4619bbe948..0841766d50 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/repository/partial-views.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/repository/partial-views.repository.ts @@ -1,4 +1,4 @@ -import { Observable } from 'rxjs'; +import { Observable } from '@umbraco-cms/backoffice/external/rxjs'; import { UmbPartialViewDetailServerDataSource } from './sources/partial-views.detail.server.data.js'; import { UmbPartialViewsTreeServerDataSource } from './sources/partial-views.tree.server.data.js'; import { UmbPartialViewsStore, UMB_PARTIAL_VIEWS_STORE_CONTEXT_TOKEN } from './partial-views.store.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/user-group.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/user-group.repository.ts index 12a0ec6711..58c6bb6d75 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/user-group.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/repository/user-group.repository.ts @@ -1,4 +1,4 @@ -import { Observable } from 'rxjs'; +import { Observable } from '@umbraco-cms/backoffice/external/rxjs'; import { UmbUserGroupCollectionFilterModel, UmbUserGroupDetailDataSource } from '../types.js'; import { UmbUserGroupServerDataSource } from './sources/user-group.server.data.js'; import { UmbUserGroupCollectionServerDataSource } from './sources/user-group-collection.server.data.js'; diff --git a/src/Umbraco.Web.UI.Client/src/shared/repository/detail-repository.interface.ts b/src/Umbraco.Web.UI.Client/src/shared/repository/detail-repository.interface.ts index 83b475b52c..ebf76ee8c2 100644 --- a/src/Umbraco.Web.UI.Client/src/shared/repository/detail-repository.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/shared/repository/detail-repository.interface.ts @@ -1,4 +1,4 @@ -import { Observable } from 'rxjs'; +import { Observable } from '@umbraco-cms/backoffice/external/rxjs'; import type { ProblemDetailsModel } from '@umbraco-cms/backoffice/backend-api'; export interface UmbRepositoryErrorResponse { diff --git a/src/Umbraco.Web.UI.Client/src/shared/repository/item-repository.interface.ts b/src/Umbraco.Web.UI.Client/src/shared/repository/item-repository.interface.ts index 3f92cb70e8..68093be25c 100644 --- a/src/Umbraco.Web.UI.Client/src/shared/repository/item-repository.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/shared/repository/item-repository.interface.ts @@ -1,4 +1,4 @@ -import type { Observable } from 'rxjs'; +import type { Observable } from '@umbraco-cms/backoffice/external/rxjs'; import { ItemResponseModelBaseModel, ProblemDetailsModel } from '@umbraco-cms/backoffice/backend-api'; export interface UmbItemRepository { diff --git a/src/Umbraco.Web.UI.Client/src/shared/repository/tree-repository.interface.ts b/src/Umbraco.Web.UI.Client/src/shared/repository/tree-repository.interface.ts index edb3221f33..981a3caed1 100644 --- a/src/Umbraco.Web.UI.Client/src/shared/repository/tree-repository.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/shared/repository/tree-repository.interface.ts @@ -1,4 +1,4 @@ -import type { Observable } from 'rxjs'; +import type { Observable } from '@umbraco-cms/backoffice/external/rxjs'; import type { UmbTreeRootEntityModel, UmbTreeRootModel } from '@umbraco-cms/backoffice/tree'; import { ProblemDetailsModel, TreeItemPresentationModel } from '@umbraco-cms/backoffice/backend-api'; diff --git a/src/Umbraco.Web.UI.Client/src/shared/router/generate-route-path-builder.function.ts b/src/Umbraco.Web.UI.Client/src/shared/router/generate-route-path-builder.function.ts index 1529e93498..5ad4606f83 100644 --- a/src/Umbraco.Web.UI.Client/src/shared/router/generate-route-path-builder.function.ts +++ b/src/Umbraco.Web.UI.Client/src/shared/router/generate-route-path-builder.function.ts @@ -1,5 +1,5 @@ /* eslint-disable */ -import { stripSlash } from 'router-slot/util'; // This must only include the util to avoid side effects of registering the route element. +import { stripSlash } from '@umbraco-cms/backoffice/external/router-slot'; // This must only include the util to avoid side effects of registering the route element. const PARAM_IDENTIFIER = /:([^\\/]+)/g; diff --git a/src/Umbraco.Web.UI.Client/src/shared/router/index.ts b/src/Umbraco.Web.UI.Client/src/shared/router/index.ts index 2ea91bced1..548bb725cc 100644 --- a/src/Umbraco.Web.UI.Client/src/shared/router/index.ts +++ b/src/Umbraco.Web.UI.Client/src/shared/router/index.ts @@ -2,18 +2,7 @@ export * from './router-slot.element.js'; export * from './router-slot-change.event.js'; export * from './router-slot-init.event.js'; export * from './variant-router-slot.element.js'; -export type { - PageComponent, - Guard, - IRoutingInfo, - IComponentRoute, - IRedirectRoute, - IResolverRoute, - IRouterSlot, - Params, - Query, -} from 'router-slot/model'; -export * from 'router-slot/util'; +export * from '@umbraco-cms/backoffice/external/router-slot'; export * from './route.context.js'; export * from './route.interface.js'; export * from './generate-route-path-builder.function.js'; diff --git a/src/Umbraco.Web.UI.Client/src/shared/router/route.context.ts b/src/Umbraco.Web.UI.Client/src/shared/router/route.context.ts index 115248481f..3a77e8888b 100644 --- a/src/Umbraco.Web.UI.Client/src/shared/router/route.context.ts +++ b/src/Umbraco.Web.UI.Client/src/shared/router/route.context.ts @@ -1,5 +1,5 @@ // eslint-disable-next-line local-rules/no-external-imports -import type { IRoutingInfo, IRouterSlot } from 'router-slot/model'; +import type { IRoutingInfo, IRouterSlot } from '@umbraco-cms/backoffice/external/router-slot'; import type { UmbRoute } from './route.interface.js'; import { generateRoutePathBuilder } from './generate-route-path-builder.function.js'; import { diff --git a/src/Umbraco.Web.UI.Client/src/shared/router/route.interface.ts b/src/Umbraco.Web.UI.Client/src/shared/router/route.interface.ts index 8c7f94ac63..71ffa95728 100644 --- a/src/Umbraco.Web.UI.Client/src/shared/router/route.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/shared/router/route.interface.ts @@ -1 +1 @@ -export type { IRoute as UmbRoute } from 'router-slot/model'; +export type { IRoute as UmbRoute } from '@umbraco-cms/backoffice/external/router-slot'; diff --git a/src/Umbraco.Web.UI.Client/src/shared/router/router-slot.element.ts b/src/Umbraco.Web.UI.Client/src/shared/router/router-slot.element.ts index bae803c427..b187ce9595 100644 --- a/src/Umbraco.Web.UI.Client/src/shared/router/router-slot.element.ts +++ b/src/Umbraco.Web.UI.Client/src/shared/router/router-slot.element.ts @@ -1,5 +1,5 @@ // eslint-disable-next-line local-rules/no-external-imports -import 'router-slot'; +import '@umbraco-cms/backoffice/external/router-slot'; import { css, html, PropertyValueMap } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { UmbRouterSlotInitEvent } from './router-slot-init.event.js'; diff --git a/src/Umbraco.Web.UI.Client/src/shared/utils/selection-manager.ts b/src/Umbraco.Web.UI.Client/src/shared/utils/selection-manager.ts index 1f74a79a64..9929a75430 100644 --- a/src/Umbraco.Web.UI.Client/src/shared/utils/selection-manager.ts +++ b/src/Umbraco.Web.UI.Client/src/shared/utils/selection-manager.ts @@ -1,4 +1,4 @@ -import { Observable } from 'rxjs'; +import { Observable } from '@umbraco-cms/backoffice/external/rxjs'; import { UmbArrayState, UmbBooleanState } from '@umbraco-cms/backoffice/observable-api'; export interface UmbSelectionManager { diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json index 2aea81fd9c..7b07f75d29 100644 --- a/src/Umbraco.Web.UI.Client/tsconfig.json +++ b/src/Umbraco.Web.UI.Client/tsconfig.json @@ -18,7 +18,10 @@ "resolveJsonModule": true, "baseUrl": ".", "paths": { + "@umbraco-cms/backoffice/external/openid": ["external/openid"], "@umbraco-cms/backoffice/backend-api": ["external/backend-api"], + "@umbraco-cms/backoffice/external/rxjs": ["external/rxjs"], + "@umbraco-cms/backoffice/external/router-slot": ["external/router-slot"], "@umbraco-cms/backoffice/context-api": ["src/libs/context-api"], "@umbraco-cms/backoffice/controller-api": ["src/libs/controller-api"],