diff --git a/src/Umbraco.Web.UI.Client/src/app.ts b/src/Umbraco.Web.UI.Client/src/app.ts index d36f9ec841..45c372635b 100644 --- a/src/Umbraco.Web.UI.Client/src/app.ts +++ b/src/Umbraco.Web.UI.Client/src/app.ts @@ -12,8 +12,8 @@ import { css, html, LitElement } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import type { Guard, IRoute } from 'router-slot/model'; -import { getManifests, getServerStatus } from './core/api/fetcher'; import { internalManifests } from './temp-internal-manifests'; +import { getManifests, getServerStatus } from '@umbraco-cms/backend-api'; import { UmbExtensionRegistry } from '@umbraco-cms/extensions-api'; import { UmbContextProviderMixin } from '@umbraco-cms/context-api'; diff --git a/src/Umbraco.Web.UI.Client/src/auth/login/login.element.ts b/src/Umbraco.Web.UI.Client/src/auth/login/login.element.ts index 018262ff40..3e96af7cf6 100644 --- a/src/Umbraco.Web.UI.Client/src/auth/login/login.element.ts +++ b/src/Umbraco.Web.UI.Client/src/auth/login/login.element.ts @@ -6,7 +6,7 @@ import { customElement, state } from 'lit/decorators.js'; import { ifDefined } from 'lit/directives/if-defined.js'; import { query } from 'router-slot'; -import { postUserLogin } from '../../core/api/fetcher'; +import { postUserLogin } from '@umbraco-cms/backend-api'; @customElement('umb-login') export default class UmbLogin extends LitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/published-status/dashboard-published-status.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/published-status/dashboard-published-status.element.ts index 88221eb656..0883f9bb5f 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/published-status/dashboard-published-status.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/published-status/dashboard-published-status.element.ts @@ -3,15 +3,15 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, LitElement } from 'lit'; import { customElement, state } from 'lit/decorators.js'; +import { UmbModalService } from '../../../core/services/modal'; +import { UmbNotificationService } from '../../../core/services/notification'; +import { UmbNotificationDefaultData } from '../../../core/services/notification/layouts/default'; import { getPublishedCacheStatus, postPublishedCacheReload, postPublishedCacheRebuild, getPublishedCacheCollect, -} from '../../../core/api/fetcher'; -import { UmbModalService } from '../../../core/services/modal'; -import { UmbNotificationService } from '../../../core/services/notification'; -import { UmbNotificationDefaultData } from '../../../core/services/notification/layouts/default'; +} from '@umbraco-cms/backend-api'; import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; @customElement('umb-dashboard-published-status') diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/telemetry/dashboard-telemetry.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/telemetry/dashboard-telemetry.element.ts index ea12859d7f..d54e7380e1 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/telemetry/dashboard-telemetry.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/telemetry/dashboard-telemetry.element.ts @@ -2,10 +2,9 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, LitElement } from 'lit'; import { unsafeHTML } from 'lit/directives/unsafe-html.js'; import { customElement, state } from 'lit/decorators.js'; -import { getConsentLevel, getConsentLevels, postConsentLevel } from '../../../core/api/fetcher'; +import { getConsentLevel, getConsentLevels, postConsentLevel } from '@umbraco-cms/backend-api'; import type { TelemetryModel } from '@umbraco-cms/models'; - export type SettingOption = 'Minimal' | 'Basic' | 'Detailed'; @customElement('umb-dashboard-telemetry') diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/packages-installed.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/packages-installed.element.ts index 8888132818..1e6057d0a3 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/packages-installed.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/packages-installed.element.ts @@ -4,7 +4,7 @@ import { html, LitElement, nothing } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { repeat } from 'lit/directives/repeat.js'; -import { getPackagesInstalled } from '../../../core/api/fetcher'; +import { getPackagesInstalled } from '@umbraco-cms/backend-api'; import type { PackageInstalled } from '@umbraco-cms/models'; diff --git a/src/Umbraco.Web.UI.Client/src/core/api/fetcher.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/fetcher.ts similarity index 99% rename from src/Umbraco.Web.UI.Client/src/core/api/fetcher.ts rename to src/Umbraco.Web.UI.Client/src/core/backend-api/fetcher.ts index 9a45dc0f8e..2934e36a4b 100644 --- a/src/Umbraco.Web.UI.Client/src/core/api/fetcher.ts +++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/fetcher.ts @@ -25,7 +25,6 @@ export const getConsentLevels = fetcher.path('/telemetry/ConsentLevels').method( export const getConsentLevel = fetcher.path('/telemetry/ConsentLevel').method('get').create(); export const postConsentLevel = fetcher.path('/telemetry/ConsentLevel').method('post').create(); - // Property Editors export const getPropertyEditorsList = fetcher.path('/property-editors/list').method('get').create(); export const getPropertyEditor = fetcher @@ -40,4 +39,3 @@ export const getPublishedCacheStatus = fetcher.path('/published-cache/status').m export const postPublishedCacheReload = fetcher.path('/published-cache/reload').method('post').create(); export const postPublishedCacheRebuild = fetcher.path('/published-cache/rebuild').method('post').create(); export const getPublishedCacheCollect = fetcher.path('/published-cache/collect').method('get').create(); - diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/index.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/index.ts new file mode 100644 index 0000000000..00e3d22222 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/index.ts @@ -0,0 +1 @@ +export * from './fetcher'; diff --git a/src/Umbraco.Web.UI.Client/src/core/stores/property-editor-config/property-editor-config.store.ts b/src/Umbraco.Web.UI.Client/src/core/stores/property-editor-config/property-editor-config.store.ts index 5556369b3b..f3b47fa2c7 100644 --- a/src/Umbraco.Web.UI.Client/src/core/stores/property-editor-config/property-editor-config.store.ts +++ b/src/Umbraco.Web.UI.Client/src/core/stores/property-editor-config/property-editor-config.store.ts @@ -1,5 +1,5 @@ import { map, Observable } from 'rxjs'; -import { getPropertyEditorConfig } from '../../api/fetcher'; +import { getPropertyEditorConfig } from '../../backend-api/fetcher'; import type { PropertyEditorConfig } from '../../models'; import { UmbDataStoreBase } from '../store'; diff --git a/src/Umbraco.Web.UI.Client/src/core/stores/property-editor/property-editor.store.ts b/src/Umbraco.Web.UI.Client/src/core/stores/property-editor/property-editor.store.ts index 678ff1f3f3..13b4c83120 100644 --- a/src/Umbraco.Web.UI.Client/src/core/stores/property-editor/property-editor.store.ts +++ b/src/Umbraco.Web.UI.Client/src/core/stores/property-editor/property-editor.store.ts @@ -1,6 +1,6 @@ import { map, Observable } from 'rxjs'; import type { PropertyEditor } from '../../models'; -import { getPropertyEditorsList, getPropertyEditor } from '../../api/fetcher'; +import { getPropertyEditorsList, getPropertyEditor } from '../../backend-api/fetcher'; import { UmbDataStoreBase } from '../store'; /** diff --git a/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.element.ts b/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.element.ts index 99fc6c337d..369cbaae50 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.element.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.element.ts @@ -3,8 +3,8 @@ import { css, CSSResultGroup, html, LitElement, nothing } from 'lit'; import { customElement, property, query, state } from 'lit/decorators.js'; import { Subscription } from 'rxjs'; -import { postInstallSetup, postInstallValidateDatabase } from '../../core/api/fetcher'; import { UmbInstallerContext } from '../installer.context'; +import { postInstallSetup, postInstallValidateDatabase } from '@umbraco-cms/backend-api'; import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; import type { UmbracoInstallerDatabaseModel, UmbracoPerformInstallDatabaseConfiguration } from '@umbraco-cms/models'; diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.context.ts b/src/Umbraco.Web.UI.Client/src/installer/installer.context.ts index b6991d318a..ae6b244fa1 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/installer.context.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/installer.context.ts @@ -1,6 +1,6 @@ import { BehaviorSubject, Observable, ReplaySubject } from 'rxjs'; -import { getInstallSettings, postInstallSetup } from '../core/api/fetcher'; +import { getInstallSettings, postInstallSetup } from '@umbraco-cms/backend-api'; import type { PostInstallRequest, ProblemDetails, UmbracoInstaller } from '@umbraco-cms/models'; /** diff --git a/src/Umbraco.Web.UI.Client/src/upgrader/upgrader.element.ts b/src/Umbraco.Web.UI.Client/src/upgrader/upgrader.element.ts index 40d314db37..c55af2226a 100644 --- a/src/Umbraco.Web.UI.Client/src/upgrader/upgrader.element.ts +++ b/src/Umbraco.Web.UI.Client/src/upgrader/upgrader.element.ts @@ -1,13 +1,11 @@ -import '../installer/shared/layout/installer-layout.element'; -import './upgrader-view.element'; - import { html, LitElement } from 'lit'; import { customElement, state } from 'lit/decorators.js'; - -import { getUpgradeSettings, PostUpgradeAuthorize } from '../core/api/fetcher'; - +import { getUpgradeSettings, PostUpgradeAuthorize } from '@umbraco-cms/backend-api'; import type { UmbracoUpgrader } from '@umbraco-cms/models'; +import '../installer/shared/layout/installer-layout.element'; +import './upgrader-view.element'; + /** * @element umb-upgrader */ diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json index d73ef2eafb..7aa69cbaac 100644 --- a/src/Umbraco.Web.UI.Client/tsconfig.json +++ b/src/Umbraco.Web.UI.Client/tsconfig.json @@ -25,7 +25,7 @@ "baseUrl": ".", "paths": { "@umbraco-cms/models": ["./src/core/models"], - "@umbraco-cms/api": ["./src/core/api"], + "@umbraco-cms/backend-api": ["./src/core/backend-api"], "@umbraco-cms/context-api": ["./src/core/context"], "@umbraco-cms/extensions-api": ["./src/core/extension"], "@umbraco-cms/utils": ["./src/core/helpers"],