From f4e9af1e02a1f35896269870d267144114800ca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Mon, 5 Jun 2023 22:28:02 +0200 Subject: [PATCH] order of import maps --- src/Umbraco.Web.UI.Client/package.json | 2 +- src/Umbraco.Web.UI.Client/tsconfig.json | 4 ++-- src/Umbraco.Web.UI.Client/web-test-runner.config.mjs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 5fbfde894c..6b4059d83d 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -12,12 +12,12 @@ "./extension-api": "./dist-cms/libs/extension-api/index.js", "./observable-api": "./dist-cms/libs/observable-api/index.js", "./events": "./dist-cms/shared/umb-events/index.js", + "./icon": "./dist-cms/shared/icon/index.js", "./models": "./dist-cms/shared/models/index.js", "./repository": "./dist-cms/shared/repository/index.js", "./resources": "./dist-cms/shared/resources/index.js", "./router": "./dist-cms/shared/router/index.js", "./utils": "./dist-cms/shared/utils/index.js", - "./icon": "./dist-cms/shared/icon/index.js", "./action": "./dist-cms/packages/core/action/index.js", "./collection": "./dist-cms/packages/core/collection/index.js", "./components": "./dist-cms/packages/core/components/index.js", diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json index 79f875c96e..3f6e6ce99e 100644 --- a/src/Umbraco.Web.UI.Client/tsconfig.json +++ b/src/Umbraco.Web.UI.Client/tsconfig.json @@ -20,7 +20,6 @@ "paths": { "@umbraco-cms/backoffice/external/lit": ["src/external/lit"], "@umbraco-cms/backoffice/external/openid": ["src/external/openid"], - "@umbraco-cms/backoffice/backend-api": ["src/external/backend-api"], "@umbraco-cms/backoffice/external/rxjs": ["src/external/rxjs"], "@umbraco-cms/backoffice/external/router-slot": ["src/external/router-slot"], "@umbraco-cms/backoffice/external/uuid": ["src/external/uuid"], @@ -28,6 +27,7 @@ "@umbraco-cms/backoffice/external/uui": ["src/external/uui"], "@umbraco-cms/backoffice/external/monaco-editor": ["src/external/monaco-editor"], + "@umbraco-cms/backoffice/backend-api": ["src/external/backend-api"], "@umbraco-cms/backoffice/context-api": ["src/libs/context-api"], "@umbraco-cms/backoffice/controller-api": ["src/libs/controller-api"], "@umbraco-cms/backoffice/element-api": ["src/libs/element-api"], @@ -36,12 +36,12 @@ // SHARED "@umbraco-cms/backoffice/events": ["src/shared/umb-events"], + "@umbraco-cms/backoffice/icon": ["src/shared/icon-registry"], "@umbraco-cms/backoffice/models": ["src/shared/models"], "@umbraco-cms/backoffice/repository": ["src/shared/repository"], "@umbraco-cms/backoffice/resources": ["src/shared/resources"], "@umbraco-cms/backoffice/router": ["src/shared/router"], "@umbraco-cms/backoffice/utils": ["src/shared/utils"], - "@umbraco-cms/backoffice/icon": ["src/shared/icon-registry"], // CORE "@umbraco-cms/backoffice/action": ["src/packages/core/action"], 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 ecd045200c..04842592d0 100644 --- a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs +++ b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs @@ -32,7 +32,6 @@ export default { imports: { 'src/': './src/', - '@umbraco-cms/backoffice/backend-api': './src/external/backend-api/index.ts', '@umbraco-cms/backoffice/external/uui': './src/external/uui/index.ts', '@umbraco-cms/backoffice/external/lit': './src/external/lit/index.ts', '@umbraco-cms/backoffice/external/openid': './src/external/openid/index.ts', @@ -42,6 +41,7 @@ export default { '@umbraco-cms/backoffice/external/lodash': './src/external/lodash/index.ts', '@umbraco-cms/backoffice/external/monaco-editor': './src/external/monaco-editor/index.ts', + '@umbraco-cms/backoffice/backend-api': './src/external/backend-api/index.ts', '@umbraco-cms/backoffice/context-api': './src/libs/context-api/index.ts', '@umbraco-cms/backoffice/controller-api': './src/libs/controller-api/index.ts', '@umbraco-cms/backoffice/element-api': './src/libs/element-api/index.ts', @@ -49,12 +49,12 @@ export default { '@umbraco-cms/backoffice/observable-api': './src/libs/observable-api/index.ts', '@umbraco-cms/backoffice/events': './src/shared/umb-events/index.ts', + '@umbraco-cms/backoffice/icon': './src/shared/icon-registry/index.ts', '@umbraco-cms/backoffice/models': './src/shared/models/index.ts', '@umbraco-cms/backoffice/repository': './src/shared/repository/index.ts', '@umbraco-cms/backoffice/resources': './src/shared/resources/index.ts', '@umbraco-cms/backoffice/router': './src/shared/router/index.ts', '@umbraco-cms/backoffice/utils': './src/shared/utils/index.ts', - '@umbraco-cms/backoffice/icon': './src/shared/icon-registry/index.ts', '@umbraco-cms/internal/lit-element': './src/shared/lit-element/index.ts', '@umbraco-cms/internal/modal': './src/shared/modal/index.ts',