diff --git a/src/Umbraco.Web.UI.Client/.github/CONTRIBUTING.md b/src/Umbraco.Web.UI.Client/.github/CONTRIBUTING.md index 38b8362ab1..63d79f6cf7 100644 --- a/src/Umbraco.Web.UI.Client/.github/CONTRIBUTING.md +++ b/src/Umbraco.Web.UI.Client/.github/CONTRIBUTING.md @@ -44,7 +44,7 @@ The frontend has an API formatter that takes the OpenAPI schema file and convert **How to convert it:** -* Run `npm run generate:api` +- Run `npm run generate:api` ## A contribution example @@ -56,9 +56,9 @@ The frontend has an API formatter that takes the OpenAPI schema file and convert Links for Lit examples and documentation: -* [https://lit.dev](https://lit.dev) -* [https://lit.dev/docs/](https://lit.dev/docs/) -* [https://lit.dev/playground/](https://lit.dev/playground/) +- [https://lit.dev](https://lit.dev) +- [https://lit.dev/docs/](https://lit.dev/docs/) +- [https://lit.dev/playground/](https://lit.dev/playground/) ### Functionality @@ -128,28 +128,29 @@ To declare the Published Cache Status Dashboard as a new manifest, we need to ad Let’s go through each of these properties… -* Type: can be one of the following: - * section - examples include: `Content`, `Media` - * dashboard - a view within a section. Examples include: the welcome dashboard - * propertyEditorUI - * editorView - * propertyAction - * tree - * editor - * treeItemAction +- Type: can be one of the following: -* Alias: is the unique key used to identify this item. -* Name: is the human-readable name for this item. + - section - examples include: `Content`, `Media` + - dashboard - a view within a section. Examples include: the welcome dashboard + - propertyEditorUI + - editorView + - propertyAction + - tree + - editor + - treeItemAction -* ElementName: this is the customElementName declared on the element at the top of the file i.e +- Alias: is the unique key used to identify this item. +- Name: is the human-readable name for this item. + +- ElementName: this is the customElementName declared on the element at the top of the file i.e ```typescript @customElement('umb-dashboard-published-status') ``` -* Loader: references a function call to import the file that the element is declared within +- Loader: references a function call to import the file that the element is declared within -* Meta: allows us to reference additional data - in our case we can specify the section that our dashboard will sit within, the pathname that will be displayed in the url and the weight of the section +- Meta: allows us to reference additional data - in our case we can specify the section that our dashboard will sit within, the pathname that will be displayed in the url and the weight of the section ## API mock handlers @@ -162,19 +163,19 @@ From the existing functionality, we can see that this is a string message that i So to define this, we must first add a handler for the Published Status called `published-status.handlers.ts` within the mocks/domains folder. In this file we will have code that looks like the following: ```typescript -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbracoPath } from '@umbraco-cms/utils'; export const handlers = [ - rest.get(umbracoPath('/published-cache/status'), (_req, res, ctx) => { - return res( - // Respond with a 200 status code - ctx.status(200), - ctx.json( - 'Database cache is ok. ContentStore contains 1 item and has 1 generation and 0 snapshot. MediaStore contains 5 items and has 1 generation and 0 snapshot.' - ) - ); - }), + rest.get(umbracoPath('/published-cache/status'), (_req, res, ctx) => { + return res( + // Respond with a 200 status code + ctx.status(200), + ctx.json( + 'Database cache is ok. ContentStore contains 1 item and has 1 generation and 0 snapshot. MediaStore contains 5 items and has 1 generation and 0 snapshot.' + ) + ); + }), ]; ``` @@ -211,7 +212,7 @@ In depth: [https://storybook.js.org/docs/web-components/get-started/introduction Reference: [https://ambitious-stone-0033b3603.1.azurestaticapps.net/](https://ambitious-stone-0033b3603.1.azurestaticapps.net/) -* Locally: `npm run storybook` +- Locally: `npm run storybook` For Umbraco UI stories, please navigate to [https://uui.umbraco.com/](https://uui.umbraco.com/) diff --git a/src/Umbraco.Web.UI.Client/e2e/installer.spec.ts b/src/Umbraco.Web.UI.Client/e2e/installer.spec.ts index cc6845ff00..7b962bdd5a 100644 --- a/src/Umbraco.Web.UI.Client/e2e/installer.spec.ts +++ b/src/Umbraco.Web.UI.Client/e2e/installer.spec.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; import { ProblemDetailsModel, RuntimeLevelModel, ServerStatusResponseModel } from '@umbraco-cms/backoffice/backend-api'; diff --git a/src/Umbraco.Web.UI.Client/e2e/upgrader.spec.ts b/src/Umbraco.Web.UI.Client/e2e/upgrader.spec.ts index 07fcffe006..55ed4c707e 100644 --- a/src/Umbraco.Web.UI.Client/e2e/upgrader.spec.ts +++ b/src/Umbraco.Web.UI.Client/e2e/upgrader.spec.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; import { ProblemDetailsModel, RuntimeLevelModel, ServerStatusResponseModel } from '@umbraco-cms/backoffice/backend-api'; import { expect, test } from './test'; diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/culture.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/culture.handlers.ts index 8c18cf5a2d..c74b4022cc 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/culture.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/culture.handlers.ts @@ -1,4 +1,5 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; + import { umbCulturesData } from '../data/culture.data'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/data-type/copy.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/data-type/copy.handlers.ts index 1d5b764699..453c315b69 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/data-type/copy.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/data-type/copy.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbDataTypeData } from '../../data/data-type.data'; import { slug } from './slug'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/data-type/detail.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/data-type/detail.handlers.ts index c362a16141..76fcb85055 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/data-type/detail.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/data-type/detail.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbDataTypeData } from '../../data/data-type.data'; import { slug } from './slug'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/data-type/folder.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/data-type/folder.handlers.ts index 9a0d5bc071..aef47899e2 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/data-type/folder.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/data-type/folder.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbDataTypeData } from '../../data/data-type.data'; import { slug } from './slug'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/data-type/item.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/data-type/item.handlers.ts index 5601aae644..79e58b270b 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/data-type/item.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/data-type/item.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbDataTypeData } from '../../data/data-type.data'; import { slug } from './slug'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/data-type/move.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/data-type/move.handlers.ts index daf980630f..dace7dc58c 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/data-type/move.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/data-type/move.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbDataTypeData } from '../../data/data-type.data'; import { slug } from './slug'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/data-type/tree.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/data-type/tree.handlers.ts index 203acd560f..4bf6e34cba 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/data-type/tree.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/data-type/tree.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbDataTypeData } from '../../data/data-type.data'; import { slug } from './slug'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/dictionary.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/dictionary.handlers.ts index 33b51c2ad4..6da73c3b6c 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/dictionary.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/dictionary.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbDictionaryData } from '../data/dictionary.data'; import { ImportDictionaryRequestModel, diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/document-type.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/document-type.handlers.ts index 75f44b4a9a..160c10c95a 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/document-type.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/document-type.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbDocumentTypeData } from '../data/document-type.data'; import type { DocumentTypeResponseModel } from '@umbraco-cms/backoffice/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/document.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/document.handlers.ts index 487ccbcb0f..a3cf17408e 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/document.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/document.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbDocumentData } from '../data/document.data'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/examine-management.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/examine-management.handlers.ts index 82bae0ed50..bdaee86612 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/examine-management.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/examine-management.handlers.ts @@ -1,8 +1,13 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { searchResultMockData, getIndexByName, PagedIndexers } from '../data/examine.data'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; -import { IndexResponseModel, PagedIndexResponseModel, PagedSearcherResponseModel, PagedSearchResultResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import { + IndexResponseModel, + PagedIndexResponseModel, + PagedSearcherResponseModel, + PagedSearchResultResponseModel, +} from '@umbraco-cms/backoffice/backend-api'; export const handlers = [ rest.get(umbracoPath('/indexer'), (_req, res, ctx) => { diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/health-check.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/health-check.handlers.ts index a4e075f140..d63bf914a6 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/health-check.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/health-check.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { getGroupByName, diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/install.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/install.handlers.ts index 819c06305a..5edcd01462 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/install.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/install.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { DatabaseInstallResponseModel, InstallVResponseModel, diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/language.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/language.handlers.ts index b6e4557351..6fa23b2f19 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/language.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/language.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbLanguagesData } from '../data/languages.data'; import { LanguageResponseModel, ProblemDetailsModel } from '@umbraco-cms/backoffice/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/log-viewer.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/log-viewer.handlers.ts index 03491bbf88..0d6550b4b3 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/log-viewer.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/log-viewer.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbLogViewerData } from '../data/log-viewer.data'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; import { SavedLogSearchRequestModel } from '@umbraco-cms/backoffice/backend-api'; diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/manifests.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/manifests.handlers.ts index 21844a3a4e..a55fd79983 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/manifests.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/manifests.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import type { PackageManifestResponse } from '../../../backoffice/packages/types'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/media-type.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/media-type.handlers.ts index c7f6cfdc13..8aed4ac44a 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/media-type.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/media-type.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbMediaTypeData } from '../data/media-type.data'; // TODO: add schema diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/media.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/media.handlers.ts index dc28dbd021..c96becda81 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/media.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/media.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbMediaData } from '../data/media.data'; import type { MediaDetails } from '../../../backoffice/media/media'; diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/member-group.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/member-group.handlers.ts index a438855cdb..ca07a8d28f 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/member-group.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/member-group.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbMemberGroupData } from '../data/member-group.data'; // TODO: add schema diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/member-type.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/member-type.handlers.ts index 4905f5fc1e..097e7925f3 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/member-type.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/member-type.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbMemberTypeData } from '../data/member-type.data'; // TODO: add schema diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/member.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/member.handlers.ts index b3a45839ae..4fa82dcef0 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/member.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/member.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbMemberData } from '../data/member.data'; // TODO: add schema diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/modelsbuilder.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/modelsbuilder.handlers.ts index f718f778de..e8a462b63a 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/modelsbuilder.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/modelsbuilder.handlers.ts @@ -1,7 +1,11 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; -import { ModelsBuilderResponseModel, ModelsModeModel, OutOfDateStatusResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import { + ModelsBuilderResponseModel, + ModelsModeModel, + OutOfDateStatusResponseModel, +} from '@umbraco-cms/backoffice/backend-api'; export const handlers = [ rest.post(umbracoPath('/models-builder/build'), async (_req, res, ctx) => { diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/package.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/package.handlers.ts index 554ddcf189..06d5ae5cb9 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/package.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/package.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { UmbId } from '@umbraco-cms/backoffice/id'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/partial-views.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/partial-views.handlers.ts index 9f8fc8d4cc..3d23bfbd6d 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/partial-views.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/partial-views.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbPartialViewsData } from '../data/partial-views.data'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/performance-profiling.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/performance-profiling.handlers.ts index 2cc0c51edf..ca47df9754 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/performance-profiling.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/performance-profiling.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; import type { ProfilingStatusResponseModel } from '@umbraco-cms/backoffice/backend-api'; diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/published-status.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/published-status.handlers.ts index 29820f0d5a..d59dd3e7ed 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/published-status.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/published-status.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/redirect-management.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/redirect-management.handlers.ts index af6d756e80..c9886f1f13 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/redirect-management.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/redirect-management.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; import { PagedRedirectUrlResponseModel, diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/relation-type.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/relation-type.handlers.ts index 0e4c1d4ea6..cb4232e43d 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/relation-type.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/relation-type.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbRelationTypeData } from '../data/relation-type.data'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/rte-embed.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/rte-embed.handlers.ts index dd811943f0..0e79447d08 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/rte-embed.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/rte-embed.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { OEmbedResult, OEmbedStatus } from '@umbraco-cms/backoffice/modal'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/server.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/server.handlers.ts index 0c3ca91e23..66b739d365 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/server.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/server.handlers.ts @@ -1,5 +1,9 @@ -import { rest } from 'msw'; -import { RuntimeLevelModel, ServerStatusResponseModel, VersionResponseModel } from '@umbraco-cms/backoffice/backend-api'; +const { rest } = window.MockServiceWorker; +import { + RuntimeLevelModel, + ServerStatusResponseModel, + VersionResponseModel, +} from '@umbraco-cms/backoffice/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; export const serverRunningHandler = rest.get(umbracoPath('/server/status'), (_req, res, ctx) => { diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/stylesheet.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/stylesheet.handlers.ts index ef252a199e..40bf29bb87 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/stylesheet.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/stylesheet.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbStylesheetData } from '../data/stylesheet.data'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/tag-handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/tag-handlers.ts index 086270399e..89e89f26c2 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/tag-handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/tag-handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; import { PagedTagResponseModel, TagResponseModel } from '@umbraco-cms/backoffice/backend-api'; diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/telemetry.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/telemetry.handlers.ts index d01ca3ee74..488d87887a 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/telemetry.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/telemetry.handlers.ts @@ -1,7 +1,11 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; -import { PagedTelemetryResponseModel, TelemetryResponseModel, TelemetryLevelModel } from '@umbraco-cms/backoffice/backend-api'; +import { + PagedTelemetryResponseModel, + TelemetryResponseModel, + TelemetryLevelModel, +} from '@umbraco-cms/backoffice/backend-api'; let telemetryLevel = TelemetryLevelModel.BASIC; diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/template.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/template.handlers.ts index 735673a0a4..6941bc1e31 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/template.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/template.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbTemplateData } from '../data/template.data'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; import { CreateTemplateRequestModel, UpdateTemplateRequestModel } from '@umbraco-cms/backoffice/backend-api'; diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/tree-media.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/tree-media.handlers.ts index 666bd348ed..d2588557dc 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/tree-media.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/tree-media.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbMediaData } from '../data/media.data'; // TODO: add schema diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/upgrade.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/upgrade.handlers.ts index bc8a42c93a..d611ea1240 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/upgrade.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/upgrade.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; import type { UpgradeSettingsResponseModel } from '@umbraco-cms/backoffice/backend-api'; diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/user-groups.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/user-groups.handlers.ts index e007de0b70..7016f649e8 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/user-groups.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/user-groups.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbUserGroupsData } from '../data/user-groups.data'; import type { UserGroupDetails } from '../../../backoffice/users/user-groups/types'; diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/user.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/user.handlers.ts index 76728489fa..ca539a9f5d 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/user.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/user.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/users.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/users.handlers.ts index de49d01f45..a6c18fd89f 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/users.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/handlers/users.handlers.ts @@ -1,4 +1,4 @@ -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { umbUsersData } from '../data/users.data'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; diff --git a/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.stories.ts b/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.stories.ts index 0c4df7d1e3..3ff8d5b80b 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.stories.ts @@ -2,7 +2,7 @@ import './installer-database.element'; import { Meta, Story } from '@storybook/web-components'; import { html } from 'lit'; -import { rest } from 'msw'; +const { rest } = window.MockServiceWorker; import { installerContextProvider } from '../shared/utils.story-helpers';