From 240ccdd74674f4c9c3ca06f4000b939f83d3f3ce Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 7 Aug 2024 15:09:12 +0200 Subject: [PATCH 01/14] bundle log viewer package --- src/Umbraco.Web.UI.Client/package-lock.json | 6 ++++++ src/Umbraco.Web.UI.Client/package.json | 1 + .../src/packages/log-viewer/package.json | 8 ++++++++ .../src/packages/log-viewer/vite.config.ts | 12 ++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/log-viewer/package.json create mode 100644 src/Umbraco.Web.UI.Client/src/packages/log-viewer/vite.config.ts diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index 3b86f9748e..a64191c00e 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -18,6 +18,7 @@ "./src/packages/documents", "./src/packages/health-check", "./src/packages/language", + "./src/packages/log-viewer", "./src/packages/media", "./src/packages/members", "./src/packages/models-builder", @@ -7506,6 +7507,10 @@ "resolved": "src/packages/language", "link": true }, + "node_modules/@umbraco-backoffice/log-viewer": { + "resolved": "src/packages/log-viewer", + "link": true + }, "node_modules/@umbraco-backoffice/media": { "resolved": "src/packages/media", "link": true @@ -22749,6 +22754,7 @@ "src/packages/language": { "name": "@umbraco-backoffice/language" }, + "src/packages/log-viewer": {}, "src/packages/media": { "name": "@umbraco-backoffice/media" }, diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 5926e95761..3b053e41ac 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -137,6 +137,7 @@ "./src/packages/documents", "./src/packages/health-check", "./src/packages/language", + "./src/packages/log-viewer", "./src/packages/media", "./src/packages/members", "./src/packages/models-builder", diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/package.json b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/package.json new file mode 100644 index 0000000000..b9eeb6c15c --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/package.json @@ -0,0 +1,8 @@ +{ + "name": "@umbraco-backoffice/log-viewer", + "private": true, + "type": "module", + "scripts": { + "build": "vite build" + } +} \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/vite.config.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/vite.config.ts new file mode 100644 index 0000000000..f7e77cd976 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/vite.config.ts @@ -0,0 +1,12 @@ +import { defineConfig } from 'vite'; +import { rmSync } from 'fs'; +import { getDefaultConfig } from '../../vite-config-base'; + +const dist = '../../../dist-cms/packages/log-viewer'; + +// delete the unbundled dist folder +rmSync(dist, { recursive: true, force: true }); + +export default defineConfig({ + ...getDefaultConfig({ dist }), +}); From b538195b58ff61eae593d8790f4fe80ae581393c Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 8 Aug 2024 11:00:07 +0200 Subject: [PATCH 02/14] build setup --- src/Umbraco.Web.UI.Client/package.json | 1 + .../src/packages/static-file/package.json | 8 ++++++++ .../src/packages/static-file/vite.config.ts | 12 ++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/static-file/package.json create mode 100644 src/Umbraco.Web.UI.Client/src/packages/static-file/vite.config.ts diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 9d5bc0795f..0b211c8e74 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -144,6 +144,7 @@ "./src/packages/packages", "./src/packages/property-editors", "./src/packages/search", + "./src/packages/static-file", "./src/packages/tags", "./src/packages/templating", "./src/packages/tiny-mce", diff --git a/src/Umbraco.Web.UI.Client/src/packages/static-file/package.json b/src/Umbraco.Web.UI.Client/src/packages/static-file/package.json new file mode 100644 index 0000000000..9b84eeb204 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/static-file/package.json @@ -0,0 +1,8 @@ +{ + "name": "@umbraco-backoffice/static-file", + "private": true, + "type": "module", + "scripts": { + "build": "vite build" + } +} \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/packages/static-file/vite.config.ts b/src/Umbraco.Web.UI.Client/src/packages/static-file/vite.config.ts new file mode 100644 index 0000000000..fde0eb382a --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/static-file/vite.config.ts @@ -0,0 +1,12 @@ +import { defineConfig } from 'vite'; +import { rmSync } from 'fs'; +import { getDefaultConfig } from '../../vite-config-base'; + +const dist = '../../../dist-cms/packages/static-file'; + +// delete the unbundled dist folder +rmSync(dist, { recursive: true, force: true }); + +export default defineConfig({ + ...getDefaultConfig({ dist }), +}); From bb6112ba7e5d3d03bcbd90186e9a5bc5fe9241cf Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 8 Aug 2024 11:04:31 +0200 Subject: [PATCH 03/14] move constants to constants file --- .../modals/static-file-picker-modal.token.ts | 2 +- .../src/packages/static-file/tree/constants.ts | 4 ++++ .../src/packages/static-file/tree/index.ts | 2 +- .../src/packages/static-file/tree/manifests.ts | 11 ++++++----- 4 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/static-file/tree/constants.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/static-file/modals/static-file-picker-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/static-file/modals/static-file-picker-modal.token.ts index a1e5c2383d..9dec85120a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/static-file/modals/static-file-picker-modal.token.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/static-file/modals/static-file-picker-modal.token.ts @@ -1,4 +1,4 @@ -import { UMB_STATIC_FILE_TREE_ALIAS } from '../tree/manifests.js'; +import { UMB_STATIC_FILE_TREE_ALIAS } from '../tree/index.js'; import type { UmbStaticFileItemModel } from '../repository/item/types.js'; import { type UmbTreePickerModalValue, diff --git a/src/Umbraco.Web.UI.Client/src/packages/static-file/tree/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/static-file/tree/constants.ts new file mode 100644 index 0000000000..ed91eeeaa5 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/static-file/tree/constants.ts @@ -0,0 +1,4 @@ +export const UMB_STATIC_FILE_TREE_REPOSITORY_ALIAS = 'Umb.Repository.StaticFile.Tree'; +export const UMB_STATIC_FILE_TREE_STORE_ALIAS = 'Umb.Store.StaticFile.Tree'; +export const UMB_STATIC_FILE_TREE_ALIAS = 'Umb.Tree.StaticFile'; +export const UMB_STATIC_FILE_TREE_ITEM_ALIAS = 'Umb.TreeItem.StaticFile'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/static-file/tree/index.ts b/src/Umbraco.Web.UI.Client/src/packages/static-file/tree/index.ts index ef66c13c81..1e974c5fe4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/static-file/tree/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/static-file/tree/index.ts @@ -3,4 +3,4 @@ export { UMB_STATIC_FILE_TREE_REPOSITORY_ALIAS, UMB_STATIC_FILE_TREE_STORE_ALIAS, UMB_STATIC_FILE_TREE_ALIAS, -} from './manifests.js'; +} from './constants.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/static-file/tree/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/static-file/tree/manifests.ts index a9f81fd83b..72e84e09e2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/static-file/tree/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/static-file/tree/manifests.ts @@ -3,6 +3,12 @@ import { UMB_STATIC_FILE_FOLDER_ENTITY_TYPE, UMB_STATIC_FILE_ROOT_ENTITY_TYPE, } from '../entity.js'; +import { + UMB_STATIC_FILE_TREE_ALIAS, + UMB_STATIC_FILE_TREE_ITEM_ALIAS, + UMB_STATIC_FILE_TREE_REPOSITORY_ALIAS, + UMB_STATIC_FILE_TREE_STORE_ALIAS, +} from './constants.js'; import type { ManifestRepository, ManifestTree, @@ -11,11 +17,6 @@ import type { ManifestTypes, } from '@umbraco-cms/backoffice/extension-registry'; -export const UMB_STATIC_FILE_TREE_REPOSITORY_ALIAS = 'Umb.Repository.StaticFile.Tree'; -export const UMB_STATIC_FILE_TREE_STORE_ALIAS = 'Umb.Store.StaticFile.Tree'; -export const UMB_STATIC_FILE_TREE_ALIAS = 'Umb.Tree.StaticFile'; -export const UMB_STATIC_FILE_TREE_ITEM_ALIAS = 'Umb.TreeItem.StaticFile'; - const treeRepository: ManifestRepository = { type: 'repository', alias: UMB_STATIC_FILE_TREE_REPOSITORY_ALIAS, From 346d0211d4e1a5ead3c73ffc64f71433065598bf Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 8 Aug 2024 11:07:31 +0200 Subject: [PATCH 04/14] Update package-lock.json --- src/Umbraco.Web.UI.Client/package-lock.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index 54c785f561..7fa3688d98 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -25,6 +25,7 @@ "./src/packages/packages", "./src/packages/property-editors", "./src/packages/search", + "./src/packages/static-file", "./src/packages/tags", "./src/packages/templating", "./src/packages/tiny-mce", @@ -7535,6 +7536,10 @@ "resolved": "src/packages/search", "link": true }, + "node_modules/@umbraco-backoffice/static-file": { + "resolved": "src/packages/static-file", + "link": true + }, "node_modules/@umbraco-backoffice/tag": { "resolved": "src/packages/tags", "link": true @@ -22766,13 +22771,16 @@ "src/packages/multi-url-picker": { "name": "@umbraco-backoffice/multi-url-picker" }, - "src/packages/packages": {}, + "src/packages/packages": { + "name": "@umbraco-backoffice/package" + }, "src/packages/property-editors": { "name": "@umbraco-backoffice/property-editors" }, "src/packages/search": { "name": "@umbraco-backoffice/search" }, + "src/packages/static-file": {}, "src/packages/tags": { "name": "@umbraco-backoffice/tag" }, From f374c21e0ff924aa8ce51e69b0db815edf58a79c Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 8 Aug 2024 11:39:13 +0200 Subject: [PATCH 05/14] add build files --- src/Umbraco.Web.UI.Client/package-lock.json | 10 +++++++++- src/Umbraco.Web.UI.Client/package.json | 1 + .../src/packages/relations/package.json | 8 ++++++++ .../src/packages/relations/vite.config.ts | 12 ++++++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/relations/package.json create mode 100644 src/Umbraco.Web.UI.Client/src/packages/relations/vite.config.ts diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index 54c785f561..9337ef8da6 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -24,6 +24,7 @@ "./src/packages/multi-url-picker", "./src/packages/packages", "./src/packages/property-editors", + "./src/packages/relations", "./src/packages/search", "./src/packages/tags", "./src/packages/templating", @@ -7531,6 +7532,10 @@ "resolved": "src/packages/property-editors", "link": true }, + "node_modules/@umbraco-backoffice/relation": { + "resolved": "src/packages/relations", + "link": true + }, "node_modules/@umbraco-backoffice/search": { "resolved": "src/packages/search", "link": true @@ -22766,10 +22771,13 @@ "src/packages/multi-url-picker": { "name": "@umbraco-backoffice/multi-url-picker" }, - "src/packages/packages": {}, + "src/packages/packages": { + "name": "@umbraco-backoffice/package" + }, "src/packages/property-editors": { "name": "@umbraco-backoffice/property-editors" }, + "src/packages/relations": {}, "src/packages/search": { "name": "@umbraco-backoffice/search" }, diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 9d5bc0795f..7c55822a85 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -143,6 +143,7 @@ "./src/packages/multi-url-picker", "./src/packages/packages", "./src/packages/property-editors", + "./src/packages/relations", "./src/packages/search", "./src/packages/tags", "./src/packages/templating", diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/package.json b/src/Umbraco.Web.UI.Client/src/packages/relations/package.json new file mode 100644 index 0000000000..ed717f3881 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/package.json @@ -0,0 +1,8 @@ +{ + "name": "@umbraco-backoffice/relation", + "private": true, + "type": "module", + "scripts": { + "build": "vite build" + } +} \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/vite.config.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/vite.config.ts new file mode 100644 index 0000000000..755e0b84b0 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/vite.config.ts @@ -0,0 +1,12 @@ +import { defineConfig } from 'vite'; +import { rmSync } from 'fs'; +import { getDefaultConfig } from '../../vite-config-base'; + +const dist = '../../../dist-cms/packages/relations'; + +// delete the unbundled dist folder +rmSync(dist, { recursive: true, force: true }); + +export default defineConfig({ + ...getDefaultConfig({ dist }), +}); From 904d59525aee7c0968ccc32bc5611606af528672 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 8 Aug 2024 11:39:20 +0200 Subject: [PATCH 06/14] move consts --- .../relations/relation-types/collection/constants.ts | 1 + .../packages/relations/relation-types/collection/index.ts | 2 +- .../relations/relation-types/collection/manifests.ts | 3 +-- .../relation-types/collection/repository/constants.ts | 1 + .../relations/relation-types/collection/repository/index.ts | 2 +- .../relation-types/collection/repository/manifests.ts | 3 +-- .../relations/relation-types/repository/detail/constants.ts | 2 ++ .../relations/relation-types/repository/detail/index.ts | 2 +- .../relations/relation-types/repository/detail/manifests.ts | 5 +---- 9 files changed, 10 insertions(+), 11 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/constants.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/repository/constants.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/detail/constants.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/constants.ts new file mode 100644 index 0000000000..8eb94e7ee4 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/constants.ts @@ -0,0 +1 @@ +export const UMB_RELATION_TYPE_COLLECTION_ALIAS = 'Umb.Collection.RelationType'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/index.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/index.ts index 64a5d76908..6dcf6dd58e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/index.ts @@ -1,2 +1,2 @@ export { UmbRelationTypeCollectionRepository } from './repository/index.js'; -export { UMB_RELATION_TYPE_COLLECTION_ALIAS } from './manifests.js'; +export { UMB_RELATION_TYPE_COLLECTION_ALIAS } from './constants.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/manifests.ts index fa2f027bca..92464432af 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/manifests.ts @@ -1,10 +1,9 @@ +import { UMB_RELATION_TYPE_COLLECTION_ALIAS } from './constants.js'; import { UMB_RELATION_TYPE_COLLECTION_REPOSITORY_ALIAS } from './repository/index.js'; import { manifests as collectionRepositoryManifests } from './repository/manifests.js'; import { manifests as collectionViewManifests } from './views/manifests.js'; import type { ManifestCollection, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const UMB_RELATION_TYPE_COLLECTION_ALIAS = 'Umb.Collection.RelationType'; - const collectionManifest: ManifestCollection = { type: 'collection', kind: 'default', diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/repository/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/repository/constants.ts new file mode 100644 index 0000000000..86bdb48b1c --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/repository/constants.ts @@ -0,0 +1 @@ +export const UMB_RELATION_TYPE_COLLECTION_REPOSITORY_ALIAS = 'Umb.Repository.RelationType.Collection'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/repository/index.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/repository/index.ts index 4e128f9d5d..142b390843 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/repository/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/repository/index.ts @@ -1,2 +1,2 @@ -export { UMB_RELATION_TYPE_COLLECTION_REPOSITORY_ALIAS } from './manifests.js'; +export { UMB_RELATION_TYPE_COLLECTION_REPOSITORY_ALIAS } from './constants.js'; export { UmbRelationTypeCollectionRepository } from './relation-type-collection.repository.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/repository/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/repository/manifests.ts index 9de27e01d1..9c879ceacf 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/repository/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/repository/manifests.ts @@ -1,7 +1,6 @@ +import { UMB_RELATION_TYPE_COLLECTION_REPOSITORY_ALIAS } from './constants.js'; import type { ManifestRepository, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const UMB_RELATION_TYPE_COLLECTION_REPOSITORY_ALIAS = 'Umb.Repository.RelationType.Collection'; - const repository: ManifestRepository = { type: 'repository', alias: UMB_RELATION_TYPE_COLLECTION_REPOSITORY_ALIAS, diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/detail/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/detail/constants.ts new file mode 100644 index 0000000000..a1025f4c1c --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/detail/constants.ts @@ -0,0 +1,2 @@ +export const UMB_RELATION_TYPE_DETAIL_REPOSITORY_ALIAS = 'Umb.Repository.RelationType.Detail'; +export const UMB_RELATION_TYPE_DETAIL_STORE_ALIAS = 'Umb.Store.RelationType.Detail'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/detail/index.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/detail/index.ts index e5e155c2c7..19e0e34ac8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/detail/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/detail/index.ts @@ -1,2 +1,2 @@ export { UmbRelationTypeDetailRepository } from './relation-type-detail.repository.js'; -export { UMB_RELATION_TYPE_DETAIL_REPOSITORY_ALIAS } from './manifests.js'; +export { UMB_RELATION_TYPE_DETAIL_REPOSITORY_ALIAS } from './constants.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/detail/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/detail/manifests.ts index cf88507bae..9dc550e148 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/detail/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/detail/manifests.ts @@ -1,7 +1,6 @@ +import { UMB_RELATION_TYPE_DETAIL_REPOSITORY_ALIAS, UMB_RELATION_TYPE_DETAIL_STORE_ALIAS } from './constants.js'; import type { ManifestRepository, ManifestStore, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const UMB_RELATION_TYPE_DETAIL_REPOSITORY_ALIAS = 'Umb.Repository.RelationType.Detail'; - const repository: ManifestRepository = { type: 'repository', alias: UMB_RELATION_TYPE_DETAIL_REPOSITORY_ALIAS, @@ -9,8 +8,6 @@ const repository: ManifestRepository = { api: () => import('./relation-type-detail.repository.js'), }; -export const UMB_RELATION_TYPE_DETAIL_STORE_ALIAS = 'Umb.Store.RelationType.Detail'; - const store: ManifestStore = { type: 'store', alias: UMB_RELATION_TYPE_DETAIL_STORE_ALIAS, From 4211564550463c6127a6ecb59e9150f08292a855 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 8 Aug 2024 12:24:59 +0200 Subject: [PATCH 07/14] Update package-lock.json --- src/Umbraco.Web.UI.Client/package-lock.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index 9337ef8da6..22235cb71a 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -22777,7 +22777,9 @@ "src/packages/property-editors": { "name": "@umbraco-backoffice/property-editors" }, - "src/packages/relations": {}, + "src/packages/relations": { + "name": "@umbraco-backoffice/relation" + }, "src/packages/search": { "name": "@umbraco-backoffice/search" }, From db2770d23117d222e200dec50f0d0edb66f6fece Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 8 Aug 2024 12:35:28 +0200 Subject: [PATCH 08/14] build submodules --- .../src/packages/relations/vite.config.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/vite.config.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/vite.config.ts index 755e0b84b0..b1b16816e8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/relations/vite.config.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/vite.config.ts @@ -8,5 +8,13 @@ const dist = '../../../dist-cms/packages/relations'; rmSync(dist, { recursive: true, force: true }); export default defineConfig({ - ...getDefaultConfig({ dist }), + ...getDefaultConfig({ + dist, + entry: { + 'relation-types/index': 'relation-types/index.ts', + 'relations/index': 'relations/index.ts', + manifests: 'manifests.ts', + 'umbraco-package': 'umbraco-package.ts', + }, + }), }); From 49d790758e8353cabecfe3d8080aef01fbb24782 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 8 Aug 2024 12:42:56 +0200 Subject: [PATCH 09/14] Delete index.ts --- src/Umbraco.Web.UI.Client/src/packages/relations/index.ts | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/relations/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/index.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/index.ts deleted file mode 100644 index 2a421f612c..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/relations/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -import './relation-types/index.js'; -import './relations/index.js'; - -export * from './manifests.js'; From 73db0520cd0486e489d1603401236328290ce3f8 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 8 Aug 2024 13:13:32 +0200 Subject: [PATCH 10/14] build setup --- src/Umbraco.Web.UI.Client/package-lock.json | 10 +++++++++- src/Umbraco.Web.UI.Client/package.json | 1 + .../src/packages/markdown-editor/package.json | 8 ++++++++ .../src/packages/markdown-editor/vite.config.ts | 12 ++++++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/markdown-editor/package.json create mode 100644 src/Umbraco.Web.UI.Client/src/packages/markdown-editor/vite.config.ts diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index 54c785f561..c5b09551f0 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -18,6 +18,7 @@ "./src/packages/documents", "./src/packages/health-check", "./src/packages/language", + "./src/packages/markdown-editor", "./src/packages/media", "./src/packages/members", "./src/packages/models-builder", @@ -7507,6 +7508,10 @@ "resolved": "src/packages/language", "link": true }, + "node_modules/@umbraco-backoffice/markdown": { + "resolved": "src/packages/markdown-editor", + "link": true + }, "node_modules/@umbraco-backoffice/media": { "resolved": "src/packages/media", "link": true @@ -22754,6 +22759,7 @@ "src/packages/language": { "name": "@umbraco-backoffice/language" }, + "src/packages/markdown-editor": {}, "src/packages/media": { "name": "@umbraco-backoffice/media" }, @@ -22766,7 +22772,9 @@ "src/packages/multi-url-picker": { "name": "@umbraco-backoffice/multi-url-picker" }, - "src/packages/packages": {}, + "src/packages/packages": { + "name": "@umbraco-backoffice/package" + }, "src/packages/property-editors": { "name": "@umbraco-backoffice/property-editors" }, diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 9d5bc0795f..cc2d8c88be 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -137,6 +137,7 @@ "./src/packages/documents", "./src/packages/health-check", "./src/packages/language", + "./src/packages/markdown-editor", "./src/packages/media", "./src/packages/members", "./src/packages/models-builder", diff --git a/src/Umbraco.Web.UI.Client/src/packages/markdown-editor/package.json b/src/Umbraco.Web.UI.Client/src/packages/markdown-editor/package.json new file mode 100644 index 0000000000..d0b01652c2 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/markdown-editor/package.json @@ -0,0 +1,8 @@ +{ + "name": "@umbraco-backoffice/markdown", + "private": true, + "type": "module", + "scripts": { + "build": "vite build" + } +} \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/packages/markdown-editor/vite.config.ts b/src/Umbraco.Web.UI.Client/src/packages/markdown-editor/vite.config.ts new file mode 100644 index 0000000000..1d1c040c00 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/markdown-editor/vite.config.ts @@ -0,0 +1,12 @@ +import { defineConfig } from 'vite'; +import { rmSync } from 'fs'; +import { getDefaultConfig } from '../../vite-config-base'; + +const dist = '../../../dist-cms/packages/markdown-editor'; + +// delete the unbundled dist folder +rmSync(dist, { recursive: true, force: true }); + +export default defineConfig({ + ...getDefaultConfig({ dist }), +}); From 5dee0acdaead11b06404bbbfa66f22e5ab7e492d Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 8 Aug 2024 13:36:37 +0200 Subject: [PATCH 11/14] build setup --- src/Umbraco.Web.UI.Client/package-lock.json | 10 +++++++++- src/Umbraco.Web.UI.Client/package.json | 1 + .../src/packages/ufm/package.json | 8 ++++++++ .../src/packages/ufm/vite.config.ts | 12 ++++++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/ufm/package.json create mode 100644 src/Umbraco.Web.UI.Client/src/packages/ufm/vite.config.ts diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index 54c785f561..d3111eb427 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -28,6 +28,7 @@ "./src/packages/tags", "./src/packages/templating", "./src/packages/tiny-mce", + "./src/packages/ufm", "./src/packages/umbraco-news", "./src/packages/user", "./src/packages/webhook" @@ -7547,6 +7548,10 @@ "resolved": "src/packages/tiny-mce", "link": true }, + "node_modules/@umbraco-backoffice/ufm": { + "resolved": "src/packages/ufm", + "link": true + }, "node_modules/@umbraco-backoffice/umbraco-news": { "resolved": "src/packages/umbraco-news", "link": true @@ -22766,7 +22771,9 @@ "src/packages/multi-url-picker": { "name": "@umbraco-backoffice/multi-url-picker" }, - "src/packages/packages": {}, + "src/packages/packages": { + "name": "@umbraco-backoffice/package" + }, "src/packages/property-editors": { "name": "@umbraco-backoffice/property-editors" }, @@ -22782,6 +22789,7 @@ "src/packages/tiny-mce": { "name": "@umbraco-backoffice/tiny-mce" }, + "src/packages/ufm": {}, "src/packages/umbraco-news": { "name": "@umbraco-backoffice/umbraco-news" }, diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 9d5bc0795f..da711e452c 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -147,6 +147,7 @@ "./src/packages/tags", "./src/packages/templating", "./src/packages/tiny-mce", + "./src/packages/ufm", "./src/packages/umbraco-news", "./src/packages/user", "./src/packages/webhook" diff --git a/src/Umbraco.Web.UI.Client/src/packages/ufm/package.json b/src/Umbraco.Web.UI.Client/src/packages/ufm/package.json new file mode 100644 index 0000000000..9868c4a84c --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/ufm/package.json @@ -0,0 +1,8 @@ +{ + "name": "@umbraco-backoffice/ufm", + "private": true, + "type": "module", + "scripts": { + "build": "vite build" + } +} diff --git a/src/Umbraco.Web.UI.Client/src/packages/ufm/vite.config.ts b/src/Umbraco.Web.UI.Client/src/packages/ufm/vite.config.ts new file mode 100644 index 0000000000..4a15f72e73 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/ufm/vite.config.ts @@ -0,0 +1,12 @@ +import { defineConfig } from 'vite'; +import { rmSync } from 'fs'; +import { getDefaultConfig } from '../../vite-config-base'; + +const dist = '../../../dist-cms/packages/ufm'; + +// delete the unbundled dist folder +rmSync(dist, { recursive: true, force: true }); + +export default defineConfig({ + ...getDefaultConfig({ dist }), +}); From 4074f054a6eae3bbecea13225c8d8883ba7b9107 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 8 Aug 2024 14:50:31 +0200 Subject: [PATCH 12/14] set up telemetry package and bundle --- src/Umbraco.Web.UI.Client/package.json | 1 + .../src/apps/backoffice/backoffice.element.ts | 1 + .../packages/settings/dashboards/manifests.ts | 17 ----------------- .../telemetry/dashboard-telemetry.element.ts | 0 .../telemetry/dashboard-telemetry.stories.ts | 0 .../telemetry/dashboard-telemetry.test.ts | 0 .../src/packages/telemetry/manifests.ts | 19 +++++++++++++++++++ .../src/packages/telemetry/package.json | 8 ++++++++ .../src/packages/telemetry/umbraco-package.ts | 9 +++++++++ .../src/packages/telemetry/vite.config.ts | 18 ++++++++++++++++++ 10 files changed, 56 insertions(+), 17 deletions(-) rename src/Umbraco.Web.UI.Client/src/packages/{settings/dashboards => }/telemetry/dashboard-telemetry.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{settings/dashboards => }/telemetry/dashboard-telemetry.stories.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{settings/dashboards => }/telemetry/dashboard-telemetry.test.ts (100%) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/telemetry/manifests.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/telemetry/package.json create mode 100644 src/Umbraco.Web.UI.Client/src/packages/telemetry/umbraco-package.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/telemetry/vite.config.ts diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 9d5bc0795f..c3c0a4175c 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -145,6 +145,7 @@ "./src/packages/property-editors", "./src/packages/search", "./src/packages/tags", + "./src/packages/telemetry", "./src/packages/templating", "./src/packages/tiny-mce", "./src/packages/umbraco-news", diff --git a/src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.element.ts b/src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.element.ts index b5b6c47879..e4920ef302 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.element.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.element.ts @@ -38,6 +38,7 @@ const CORE_PACKAGES = [ import('../../packages/umbraco-news/umbraco-package.js'), import('../../packages/user/umbraco-package.js'), import('../../packages/webhook/umbraco-package.js'), + import('../../packages/telemetry/umbraco-package.js'), ]; @customElement('umb-backoffice') diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/manifests.ts index 0d4c10f4e0..555f2cd9a7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/manifests.ts @@ -37,23 +37,6 @@ const dashboards: Array = [ }, ], }, - { - type: 'dashboard', - alias: 'Umb.Dashboard.Telemetry', - name: 'Telemetry', - element: () => import('./telemetry/dashboard-telemetry.element.js'), - weight: 100, - meta: { - label: 'Telemetry Data', - pathname: 'telemetry', - }, - conditions: [ - { - alias: 'Umb.Condition.SectionAlias', - match: sectionAlias, - }, - ], - }, ]; export const manifests: Array = [...dashboards]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/telemetry/dashboard-telemetry.element.ts b/src/Umbraco.Web.UI.Client/src/packages/telemetry/dashboard-telemetry.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/telemetry/dashboard-telemetry.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/telemetry/dashboard-telemetry.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/telemetry/dashboard-telemetry.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/telemetry/dashboard-telemetry.stories.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/telemetry/dashboard-telemetry.stories.ts rename to src/Umbraco.Web.UI.Client/src/packages/telemetry/dashboard-telemetry.stories.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/telemetry/dashboard-telemetry.test.ts b/src/Umbraco.Web.UI.Client/src/packages/telemetry/dashboard-telemetry.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/telemetry/dashboard-telemetry.test.ts rename to src/Umbraco.Web.UI.Client/src/packages/telemetry/dashboard-telemetry.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/telemetry/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/telemetry/manifests.ts new file mode 100644 index 0000000000..de18e665e7 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/telemetry/manifests.ts @@ -0,0 +1,19 @@ +export const manifests = [ + { + type: 'dashboard', + alias: 'Umb.Dashboard.Telemetry', + name: 'Telemetry', + element: () => import('./dashboard-telemetry.element.js'), + weight: 100, + meta: { + label: 'Telemetry Data', + pathname: 'telemetry', + }, + conditions: [ + { + alias: 'Umb.Condition.SectionAlias', + match: 'Umb.Section.Settings', + }, + ], + }, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/telemetry/package.json b/src/Umbraco.Web.UI.Client/src/packages/telemetry/package.json new file mode 100644 index 0000000000..80800d336f --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/telemetry/package.json @@ -0,0 +1,8 @@ +{ + "name": "@umbraco-backoffice/telemetry", + "private": true, + "type": "module", + "scripts": { + "build": "vite build" + } +} \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/packages/telemetry/umbraco-package.ts b/src/Umbraco.Web.UI.Client/src/packages/telemetry/umbraco-package.ts new file mode 100644 index 0000000000..4094ad7c24 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/telemetry/umbraco-package.ts @@ -0,0 +1,9 @@ +export const name = 'Umbraco.Core.Telemetry'; +export const extensions = [ + { + name: 'Telemetry Bundle', + alias: 'Umb.Bundle.Telemetry', + type: 'bundle', + js: () => import('./manifests.js'), + }, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/telemetry/vite.config.ts b/src/Umbraco.Web.UI.Client/src/packages/telemetry/vite.config.ts new file mode 100644 index 0000000000..15b98a42d8 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/telemetry/vite.config.ts @@ -0,0 +1,18 @@ +import { defineConfig } from 'vite'; +import { rmSync } from 'fs'; +import { getDefaultConfig } from '../../vite-config-base'; + +const dist = '../../../dist-cms/packages/telemetry'; + +// delete the unbundled dist folder +rmSync(dist, { recursive: true, force: true }); + +export default defineConfig({ + ...getDefaultConfig({ + dist, + entry: { + manifests: 'manifests.ts', + 'umbraco-package': 'umbraco-package.ts', + }, + }), +}); From e2f94a9bfb6b11e6bbade9f277fa871dfbd178f7 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 8 Aug 2024 14:52:28 +0200 Subject: [PATCH 13/14] Update package-lock.json --- src/Umbraco.Web.UI.Client/package-lock.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index 54c785f561..a402cb93ed 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -26,6 +26,7 @@ "./src/packages/property-editors", "./src/packages/search", "./src/packages/tags", + "./src/packages/telemetry", "./src/packages/templating", "./src/packages/tiny-mce", "./src/packages/umbraco-news", @@ -7539,6 +7540,10 @@ "resolved": "src/packages/tags", "link": true }, + "node_modules/@umbraco-backoffice/telemetry": { + "resolved": "src/packages/telemetry", + "link": true + }, "node_modules/@umbraco-backoffice/templating": { "resolved": "src/packages/templating", "link": true @@ -22766,7 +22771,9 @@ "src/packages/multi-url-picker": { "name": "@umbraco-backoffice/multi-url-picker" }, - "src/packages/packages": {}, + "src/packages/packages": { + "name": "@umbraco-backoffice/package" + }, "src/packages/property-editors": { "name": "@umbraco-backoffice/property-editors" }, @@ -22776,6 +22783,7 @@ "src/packages/tags": { "name": "@umbraco-backoffice/tag" }, + "src/packages/telemetry": {}, "src/packages/templating": { "name": "@umbraco-backoffice/templating" }, From 63de7a69138dac5507c97309063f456fd4e75455 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 8 Aug 2024 16:45:41 +0200 Subject: [PATCH 14/14] order --- .../src/apps/backoffice/backoffice.element.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.element.ts b/src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.element.ts index e4920ef302..0975e05086 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.element.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.element.ts @@ -32,13 +32,13 @@ const CORE_PACKAGES = [ import('../../packages/settings/umbraco-package.js'), import('../../packages/static-file/umbraco-package.js'), import('../../packages/tags/umbraco-package.js'), + import('../../packages/telemetry/umbraco-package.js'), import('../../packages/templating/umbraco-package.js'), import('../../packages/tiny-mce/umbraco-package.js'), import('../../packages/ufm/umbraco-package.js'), import('../../packages/umbraco-news/umbraco-package.js'), import('../../packages/user/umbraco-package.js'), import('../../packages/webhook/umbraco-package.js'), - import('../../packages/telemetry/umbraco-package.js'), ]; @customElement('umb-backoffice')