From 77a9e4ccc6789f2e46c591dd93c514cade3c9517 Mon Sep 17 00:00:00 2001 From: Lone Iversen <108085781+loivsen@users.noreply.github.com> Date: Thu, 1 Jun 2023 11:12:54 +0200 Subject: [PATCH 1/2] user exports --- src/Umbraco.Web.UI.Client/package.json | 3 +++ .../src/packages/users/current-user/index.ts | 4 ++++ .../src/packages/users/user-section/index.ts | 1 + src/Umbraco.Web.UI.Client/src/packages/users/users/index.ts | 2 ++ src/Umbraco.Web.UI.Client/tsconfig.json | 4 ++++ src/Umbraco.Web.UI.Client/web-test-runner.config.mjs | 3 +++ 6 files changed, 17 insertions(+) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/users/current-user/index.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/users/user-section/index.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/users/users/index.ts diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 9cf83e3235..4b18886e24 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -41,6 +41,9 @@ "./document": "./dist-cms/packages/documents/documents/index.js", "./data-type": "./dist-cms/packages/settings/data-types/index.js", "./user-group": "./dist-cms/packages/users/user-groups/index.js", + "./current-user": "./dist-cms/packages/users/current-user/index.js", + "./users/": "./dist-cms/packages/users/users/index.js", + "./user-section/": "./dist-cms/packages/users/user-section/index.js", "./external/*": "./dist-cms/external/*/index.js" }, "files": [ diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/current-user/index.ts b/src/Umbraco.Web.UI.Client/src/packages/users/current-user/index.ts new file mode 100644 index 0000000000..6a6c085825 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/users/current-user/index.ts @@ -0,0 +1,4 @@ +export * from './types.js'; +export * from './current-user.store.js'; +export * from './current-user-history.store.js'; +export * from './manifests.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-section/index.ts b/src/Umbraco.Web.UI.Client/src/packages/users/user-section/index.ts new file mode 100644 index 0000000000..1e95b5d703 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/users/user-section/index.ts @@ -0,0 +1 @@ +export * from './manifests.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/index.ts b/src/Umbraco.Web.UI.Client/src/packages/users/users/index.ts new file mode 100644 index 0000000000..e9b5521cde --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/users/users/index.ts @@ -0,0 +1,2 @@ +export * from './types.js'; +export * from './manifests.js'; diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json index 415d4e6c1a..61811cf745 100644 --- a/src/Umbraco.Web.UI.Client/tsconfig.json +++ b/src/Umbraco.Web.UI.Client/tsconfig.json @@ -73,6 +73,10 @@ // USERS "@umbraco-cms/backoffice/user-group": ["src/packages/users/user-groups"], + "@umbraco-cms/backoffice/current-user": ["src/packages/users/current-user"], + "@umbraco-cms/backoffice/users": ["src/packages/users/users"], + "@umbraco-cms/backoffice/user-section": ["src/packages/users/user-section"], + "@umbraco-cms/backoffice/css": ["src/shared/css/custom-properties.css"], "@umbraco-cms/internal/lit-element": ["src/shared/lit-element"], diff --git a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs index e69e89f94a..79749d6134 100644 --- a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs +++ b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs @@ -84,6 +84,9 @@ export default { '@umbraco-cms/backoffice/data-type': './src/packages/settings/data-types/index.ts', '@umbraco-cms/backoffice/user-group': './src/packages/users/user-groups/index.ts', + "@umbraco-cms/backoffice/current-user": "./src/packages/users/current-user/index.js", + "@umbraco-cms/backoffice/users": "./src/packages/users/users/index.js", + "@umbraco-cms/backoffice/user-section": "./src/packages/users/user-section/index.js", '@umbraco-cms/internal/test-utils': './utils/test-utils.ts', }, From 59d4bfd5f4a7d0ab5739a6278aff44b4cfd6e5c5 Mon Sep 17 00:00:00 2001 From: Lone Iversen <108085781+loivsen@users.noreply.github.com> Date: Thu, 1 Jun 2023 11:30:55 +0200 Subject: [PATCH 2/2] dont export manifests --- src/Umbraco.Web.UI.Client/package.json | 1 - .../src/packages/users/current-user/index.ts | 2 +- .../src/packages/users/user-section/index.ts | 1 - src/Umbraco.Web.UI.Client/src/packages/users/users/index.ts | 1 - src/Umbraco.Web.UI.Client/tsconfig.json | 1 - src/Umbraco.Web.UI.Client/web-test-runner.config.mjs | 1 - 6 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/users/user-section/index.ts diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 4b18886e24..f827f7206a 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -43,7 +43,6 @@ "./user-group": "./dist-cms/packages/users/user-groups/index.js", "./current-user": "./dist-cms/packages/users/current-user/index.js", "./users/": "./dist-cms/packages/users/users/index.js", - "./user-section/": "./dist-cms/packages/users/user-section/index.js", "./external/*": "./dist-cms/external/*/index.js" }, "files": [ diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/current-user/index.ts b/src/Umbraco.Web.UI.Client/src/packages/users/current-user/index.ts index 6a6c085825..30f15ab9c5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/users/current-user/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/users/current-user/index.ts @@ -1,4 +1,4 @@ export * from './types.js'; +// TODO:Do not export store, but instead export future repository export * from './current-user.store.js'; export * from './current-user-history.store.js'; -export * from './manifests.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-section/index.ts b/src/Umbraco.Web.UI.Client/src/packages/users/user-section/index.ts deleted file mode 100644 index 1e95b5d703..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/users/user-section/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './manifests.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/index.ts b/src/Umbraco.Web.UI.Client/src/packages/users/users/index.ts index e9b5521cde..d4702960d5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/users/users/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/users/users/index.ts @@ -1,2 +1 @@ export * from './types.js'; -export * from './manifests.js'; diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json index 61811cf745..6aa564d2ea 100644 --- a/src/Umbraco.Web.UI.Client/tsconfig.json +++ b/src/Umbraco.Web.UI.Client/tsconfig.json @@ -75,7 +75,6 @@ "@umbraco-cms/backoffice/user-group": ["src/packages/users/user-groups"], "@umbraco-cms/backoffice/current-user": ["src/packages/users/current-user"], "@umbraco-cms/backoffice/users": ["src/packages/users/users"], - "@umbraco-cms/backoffice/user-section": ["src/packages/users/user-section"], "@umbraco-cms/backoffice/css": ["src/shared/css/custom-properties.css"], diff --git a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs index 79749d6134..620a2ea5af 100644 --- a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs +++ b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs @@ -86,7 +86,6 @@ export default { '@umbraco-cms/backoffice/user-group': './src/packages/users/user-groups/index.ts', "@umbraco-cms/backoffice/current-user": "./src/packages/users/current-user/index.js", "@umbraco-cms/backoffice/users": "./src/packages/users/users/index.js", - "@umbraco-cms/backoffice/user-section": "./src/packages/users/user-section/index.js", '@umbraco-cms/internal/test-utils': './utils/test-utils.ts', },