From a69c7f460985c7104d8a2c766ecb85cf1e77b724 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Wed, 11 Sep 2024 11:23:11 +0200 Subject: [PATCH 1/2] feat: add all src/packages/* as workspaces since they have all been converted successfully --- src/Umbraco.Web.UI.Client/package-lock.json | 35 ++++----------------- src/Umbraco.Web.UI.Client/package.json | 30 +----------------- 2 files changed, 7 insertions(+), 58 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index 826baef473..9632640fa9 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -9,35 +9,7 @@ "version": "14.3.0", "license": "MIT", "workspaces": [ - "./src/packages/block", - "./src/packages/code-editor", - "./src/packages/core", - "./src/packages/data-type", - "./src/packages/dictionary", - "./src/packages/documents", - "./src/packages/health-check", - "./src/packages/language", - "./src/packages/log-viewer", - "./src/packages/markdown-editor", - "./src/packages/media", - "./src/packages/members", - "./src/packages/models-builder", - "./src/packages/multi-url-picker", - "./src/packages/packages", - "./src/packages/performance-profiling", - "./src/packages/property-editors", - "./src/packages/publish-cache", - "./src/packages/relations", - "./src/packages/search", - "./src/packages/static-file", - "./src/packages/tags", - "./src/packages/telemetry", - "./src/packages/templating", - "./src/packages/tiny-mce", - "./src/packages/ufm", - "./src/packages/umbraco-news", - "./src/packages/user", - "./src/packages/webhook" + "./src/packages/*" ], "dependencies": { "@types/diff": "^5.2.1", @@ -7895,6 +7867,10 @@ "resolved": "src/packages/static-file", "link": true }, + "node_modules/@umbraco-backoffice/sysinfo": { + "resolved": "src/packages/sysinfo", + "link": true + }, "node_modules/@umbraco-backoffice/tag": { "resolved": "src/packages/tags", "link": true @@ -23144,6 +23120,7 @@ "src/packages/static-file": { "name": "@umbraco-backoffice/static-file" }, + "src/packages/sysinfo": {}, "src/packages/tags": { "name": "@umbraco-backoffice/tag" }, diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index ac79713592..954ca87fe5 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -131,35 +131,7 @@ "url": "https://umbraco.com" }, "workspaces": [ - "./src/packages/block", - "./src/packages/code-editor", - "./src/packages/core", - "./src/packages/data-type", - "./src/packages/dictionary", - "./src/packages/documents", - "./src/packages/health-check", - "./src/packages/language", - "./src/packages/log-viewer", - "./src/packages/markdown-editor", - "./src/packages/media", - "./src/packages/members", - "./src/packages/models-builder", - "./src/packages/multi-url-picker", - "./src/packages/packages", - "./src/packages/performance-profiling", - "./src/packages/property-editors", - "./src/packages/publish-cache", - "./src/packages/relations", - "./src/packages/search", - "./src/packages/static-file", - "./src/packages/tags", - "./src/packages/telemetry", - "./src/packages/templating", - "./src/packages/tiny-mce", - "./src/packages/ufm", - "./src/packages/umbraco-news", - "./src/packages/user", - "./src/packages/webhook" + "./src/packages/*" ], "scripts": { "backoffice:test:e2e": "npx playwright test", From 734be670949714f93ee2bbc9bd7dc9a244ae7367 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Wed, 11 Sep 2024 11:23:38 +0200 Subject: [PATCH 2/2] feat: improve the loading of sysinfo to accommodate bundling --- .../src/packages/sysinfo/components/sysinfo.element.ts | 2 +- src/Umbraco.Web.UI.Client/src/packages/sysinfo/index.ts | 1 - src/Umbraco.Web.UI.Client/src/packages/sysinfo/manifests.ts | 4 +--- .../src/packages/sysinfo/modals/sysinfo-modal.token.ts | 3 +-- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/components/sysinfo.element.ts b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/components/sysinfo.element.ts index c2dc173622..50295c8b3b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/components/sysinfo.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/components/sysinfo.element.ts @@ -1,4 +1,4 @@ -import { UmbSysinfoRepository } from '../repository/sysinfo.repository.js'; +import { UmbSysinfoRepository } from '../repository/index.js'; import { css, customElement, html, state, when } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/index.ts b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/index.ts index 6196778a18..736a54915b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/index.ts @@ -1,3 +1,2 @@ -export * from './components/sysinfo.element.js'; export * from './modals/index.js'; export * from './repository/index.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/manifests.ts index fa57d5b840..8d6d1cec1a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/manifests.ts @@ -1,10 +1,8 @@ import type { ManifestModal, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const UMB_SYSINFO_MODAL_ALIAS = 'Umb.Modal.Sysinfo'; - const modalManifest: ManifestModal = { type: 'modal', - alias: UMB_SYSINFO_MODAL_ALIAS, + alias: 'Umb.Modal.Sysinfo', name: 'Sysinfo Modal', js: () => import('./components/sysinfo.element.js'), }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/modals/sysinfo-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/modals/sysinfo-modal.token.ts index d68114a4e3..5d54b75c3c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/modals/sysinfo-modal.token.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/modals/sysinfo-modal.token.ts @@ -1,7 +1,6 @@ import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; -import { UMB_SYSINFO_MODAL_ALIAS } from '../manifests.js'; -export const UMB_SYSINFO_MODAL = new UmbModalToken(UMB_SYSINFO_MODAL_ALIAS, { +export const UMB_SYSINFO_MODAL = new UmbModalToken('Umb.Modal.Sysinfo', { modal: { type: 'dialog', size: 'medium',