yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into prepare-packagejson-for-release

Browse Source
This commit is contained in:
Warren Buckley
2023-06-06 10:11:31 +01:00
committed by GitHub
parent d669e4f71a 4a0a14b61c
commit e229d0878d
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Umbraco.Web.UI.Client/.storybook/preview.js
View File

@@ -4,23 +4,21 @@ import '../src/css/umb-css.css';
import 'element-internals-polyfill';
import '@umbraco-ui/uui';
import { handlers } from '../src/mocks/browser-handlers';
import { html } from 'lit';
import { initialize, mswDecorator } from 'msw-storybook-addon';
import { onUnhandledRequest } from '../src/mocks';
import { setCustomElements } from '@storybook/web-components';
import { UMB_MODAL_CONTEXT_TOKEN, UmbModalManagerContext } from '../src/packages/core/modal';
import { UmbDataTypeStore } from '../src/packages/settings/data-types/repository/data-type.store.ts';
import { UmbDocumentTypeStore } from '../src/packages/documents/document-types/repository/document-type.store.ts';
import { UmbDocumentStore } from '../src/packages/documents/documents/repository/document.store.ts';
import { UmbDocumentTreeStore } from '../src/packages/documents/documents/repository/document.tree.store.ts';
import customElementManifests from '../dist-cms/custom-elements.json';
import { UmbIconRegistry } from '../src/shared/icon-registry/icon.registry';
import { onUnhandledRequest } from '../src/mocks';
import { handlers } from '../src/mocks/browser-handlers';
import { UMB_MODAL_CONTEXT_TOKEN, UmbModalContext } from '../src/packages/core/modal';
import { UmbLitElement } from '../src/shared/lit-element';
import { UmbDocumentTypeStore } from '../src/packages/documents/document-types/repository/document-type.store.ts';
import { umbExtensionsRegistry } from '../src/packages/core/extension-registry';
import { UmbIconRegistry } from '../src/shared/icon-registry/icon.registry';
import { UmbLitElement } from '../src/shared/lit-element';
import customElementManifests from '../dist-cms/custom-elements.json';
import '../src/libs/context-api/provide/context-provider.element';
import '../src/libs/controller-api/controller-host-initializer.element.ts';
@@ -35,7 +33,7 @@ class UmbStoryBookElement extends UmbLitElement {
super();
this._umbIconRegistry.attach(this);
this._registerExtensions(documentManifests);
this.provideContext(UMB_MODAL_CONTEXT_TOKEN, new UmbModalContext(this));
this.provideContext(UMB_MODAL_CONTEXT_TOKEN, new UmbModalManagerContext(this));
}
_registerExtensions(manifests) {

2
src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts
View File

@@ -1,6 +1,6 @@
import type { UmbAppErrorElement } from './app-error.element.js';
import { UMB_AUTH, UmbAuthFlow } from '@umbraco-cms/backoffice/auth';
import { UMB_APP, UmbAppContext } from '@umbraco-cms/backoffice/context';
import type { UmbAppErrorElement } from './app-error.element.js';
import { css, html, customElement, property } from '@umbraco-cms/backoffice/external/lit';
import { UUIIconRegistryEssential } from '@umbraco-cms/backoffice/external/uui';
import { UmbIconRegistry } from '@umbraco-cms/backoffice/icon';

2
src/Umbraco.Web.UI.Client/src/libs/extension-api/types.ts
View File

@@ -1,5 +1,5 @@
import { UmbBackofficeExtensionRegistry } from '@umbraco-cms/backoffice/extension-registry';
import type { UmbExtensionRegistry } from './registry/extension.registry.js';
import { UmbBackofficeExtensionRegistry } from '@umbraco-cms/backoffice/extension-registry';
import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
// eslint-disable-next-line @typescript-eslint/no-explicit-any

4
src/Umbraco.Web.UI.Client/src/packages/users/current-user/modals/current-user/current-user-modal.element.ts
View File

@@ -1,7 +1,7 @@
import { UMB_AUTH } from '@umbraco-cms/backoffice/auth';
import { UMB_APP } from '@umbraco-cms/backoffice/context';
import { UmbCurrentUserStore, UMB_CURRENT_USER_STORE_CONTEXT_TOKEN } from '../../current-user.store.js';
import type { UmbLoggedInUser } from '../../types.js';
import { UMB_AUTH } from '@umbraco-cms/backoffice/auth';
import { UMB_APP } from '@umbraco-cms/backoffice/context';
import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui';
import { css, CSSResultGroup, html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
import { UmbModalContext } from '@umbraco-cms/backoffice/modal';

2
src/Umbraco.Web.UI.Client/src/tsconfig.json
View File

@@ -6,6 +6,8 @@
"outDir": "../dist-cms",
"rootDir": "./",
"composite": true,
"sourceMap": true,
"declaration": true,
"resolveJsonModule": true,
},
"include": ["./**/*.ts", "./**/*.json", "./**/*.js"],