From 678350bb4d064d9b50fbf0fc629019fbcf7361b8 Mon Sep 17 00:00:00 2001 From: Christoph Reiter <reiter.christoph@gmail.com> Date: Thu, 23 Jun 2022 14:07:07 +0200 Subject: [PATCH] Import AdapterLitElement from the real source --- packages/app-shell/src/auth-menu-button.js | 2 +- packages/app-shell/src/build-info.js | 2 +- packages/app-shell/src/tugraz-logo.js | 2 +- packages/auth/src/auth-keycloak.js | 2 +- packages/common/dbp-lit-element.js | 2 +- packages/data-table-view/src/data-table-view.js | 2 +- packages/file-handling/src/clipboard.js | 2 +- .../src/knowledge-base-web-page-element-view.js | 2 +- packages/language-select/src/dbp-language-select-demo.js | 2 +- packages/language-select/src/language-select.js | 2 +- packages/person-select/src/person-select.js | 2 +- packages/provider/src/adapter-lit-element.js | 1 - packages/resource-select/src/resource-select.js | 2 +- toolkit-showcase/src/dbp-auth-demo-activity.js | 2 +- toolkit-showcase/src/dbp-common-demo-activity.js | 2 +- toolkit-showcase/src/dbp-data-table-view-demo-activity.js | 2 +- toolkit-showcase/src/dbp-demo-template.js | 2 +- toolkit-showcase/src/dbp-file-handling-demo-activity.js | 2 +- .../dbp-knowledge-base-web-page-element-view-demo-activity.js | 2 +- toolkit-showcase/src/dbp-language-select-demo-activity.js | 2 +- toolkit-showcase/src/dbp-matomo-demo-activity.js | 2 +- toolkit-showcase/src/dbp-notification-demo-activity.js | 2 +- toolkit-showcase/src/dbp-person-profile-demo-activity.js | 2 +- toolkit-showcase/src/dbp-person-select-demo-activity.js | 2 +- toolkit-showcase/src/dbp-qr-code-scanner-demo-activity.js | 2 +- toolkit-showcase/src/dbp-resource-select-demo-activity.js | 2 +- toolkit-showcase/src/dbp-theme-switcher-demo-activity.js | 2 +- toolkit-showcase/src/dbp-tooltip-demo-activity.js | 2 +- 28 files changed, 27 insertions(+), 28 deletions(-) delete mode 100644 packages/provider/src/adapter-lit-element.js diff --git a/packages/app-shell/src/auth-menu-button.js b/packages/app-shell/src/auth-menu-button.js index d580e457..f7e8d506 100644 --- a/packages/app-shell/src/auth-menu-button.js +++ b/packages/app-shell/src/auth-menu-button.js @@ -4,7 +4,7 @@ import {unsafeHTML} from 'lit/directives/unsafe-html.js'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import * as commonStyles from '@dbp-toolkit/common/styles'; import {Icon} from '@dbp-toolkit/common'; -import {AdapterLitElement} from '@dbp-toolkit/provider/src/adapter-lit-element'; +import {AdapterLitElement} from '@dbp-toolkit/common'; import {LoginStatus} from '@dbp-toolkit/auth/src/util'; export class AuthMenuButton extends ScopedElementsMixin(AdapterLitElement) { diff --git a/packages/app-shell/src/build-info.js b/packages/app-shell/src/build-info.js index f8a5e4e3..66f3cf26 100644 --- a/packages/app-shell/src/build-info.js +++ b/packages/app-shell/src/build-info.js @@ -1,6 +1,6 @@ import {html, css} from 'lit'; import * as commonStyles from '@dbp-toolkit/common/styles'; -import {AdapterLitElement} from '@dbp-toolkit/provider/src/adapter-lit-element'; +import {AdapterLitElement} from '@dbp-toolkit/common'; export class BuildInfo extends AdapterLitElement { constructor() { diff --git a/packages/app-shell/src/tugraz-logo.js b/packages/app-shell/src/tugraz-logo.js index 3dbf2a87..bc1bb741 100644 --- a/packages/app-shell/src/tugraz-logo.js +++ b/packages/app-shell/src/tugraz-logo.js @@ -1,7 +1,7 @@ import {html, css} from 'lit'; import * as commonStyles from '@dbp-toolkit/common/styles'; import {createInstance} from './i18n.js'; -import {AdapterLitElement} from '@dbp-toolkit/provider/src/adapter-lit-element'; +import {AdapterLitElement} from '@dbp-toolkit/common'; export class TUGrazLogo extends AdapterLitElement { constructor() { diff --git a/packages/auth/src/auth-keycloak.js b/packages/auth/src/auth-keycloak.js index dc4dcce2..61bd6865 100644 --- a/packages/auth/src/auth-keycloak.js +++ b/packages/auth/src/auth-keycloak.js @@ -2,7 +2,7 @@ import {createInstance} from './i18n.js'; import JSONLD from '@dbp-toolkit/common/jsonld'; import {KeycloakWrapper} from './keycloak.js'; import {LoginStatus} from './util.js'; -import {AdapterLitElement} from '@dbp-toolkit/provider/src/adapter-lit-element'; +import {AdapterLitElement} from '@dbp-toolkit/common'; import {send} from '@dbp-toolkit/common/notification'; /** diff --git a/packages/common/dbp-lit-element.js b/packages/common/dbp-lit-element.js index a299d582..4b3b9a8d 100644 --- a/packages/common/dbp-lit-element.js +++ b/packages/common/dbp-lit-element.js @@ -1,4 +1,4 @@ -import {AdapterLitElement} from './src/adapter-lit-element'; +import {AdapterLitElement} from './src/adapter-lit-element.js'; export default class DBPLitElement extends AdapterLitElement { constructor() { diff --git a/packages/data-table-view/src/data-table-view.js b/packages/data-table-view/src/data-table-view.js index 1ef4a759..576934ea 100644 --- a/packages/data-table-view/src/data-table-view.js +++ b/packages/data-table-view/src/data-table-view.js @@ -15,7 +15,7 @@ import {getIconSVGURL} from '@dbp-toolkit/common'; import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonStyles from '@dbp-toolkit/common/styles'; import {name as pkgName} from './../package.json'; -import {AdapterLitElement} from '@dbp-toolkit/provider/src/adapter-lit-element'; +import {AdapterLitElement} from '@dbp-toolkit/common'; dt(window, $); resp(window, $); diff --git a/packages/file-handling/src/clipboard.js b/packages/file-handling/src/clipboard.js index 1b105fd6..250e0b01 100644 --- a/packages/file-handling/src/clipboard.js +++ b/packages/file-handling/src/clipboard.js @@ -9,7 +9,7 @@ import {TabulatorFull as Tabulator} from 'tabulator-tables'; import {humanFileSize} from '@dbp-toolkit/common/i18next'; import {name as pkgName} from '@dbp-toolkit/file-handling/package.json'; import {send} from '@dbp-toolkit/common/notification'; -import {AdapterLitElement} from '@dbp-toolkit/provider/src/adapter-lit-element'; +import {AdapterLitElement} from '@dbp-toolkit/common'; import {classMap} from 'lit/directives/class-map.js'; const MODE_TABLE_ONLY = 'table-only'; diff --git a/packages/knowledge-base-web-page-element-view/src/knowledge-base-web-page-element-view.js b/packages/knowledge-base-web-page-element-view/src/knowledge-base-web-page-element-view.js index 0ea6ad61..598075f5 100644 --- a/packages/knowledge-base-web-page-element-view/src/knowledge-base-web-page-element-view.js +++ b/packages/knowledge-base-web-page-element-view/src/knowledge-base-web-page-element-view.js @@ -4,7 +4,7 @@ import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {MiniSpinner} from '@dbp-toolkit/common'; import * as commonUtils from '@dbp-toolkit/common/utils'; import {unsafeHTML} from 'lit/directives/unsafe-html.js'; -import {AdapterLitElement} from '@dbp-toolkit/provider/src/adapter-lit-element'; +import {AdapterLitElement} from '@dbp-toolkit/common'; /** * KnowledgeBaseWebPageElementView web component diff --git a/packages/language-select/src/dbp-language-select-demo.js b/packages/language-select/src/dbp-language-select-demo.js index cd0ade8c..8cf48ce0 100644 --- a/packages/language-select/src/dbp-language-select-demo.js +++ b/packages/language-select/src/dbp-language-select-demo.js @@ -2,7 +2,7 @@ import {html} from 'lit'; import {LanguageSelect} from './language-select.js'; import * as commonUtils from '@dbp-toolkit/common/utils'; import { ScopedElementsMixin } from '@open-wc/scoped-elements'; -import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element"; +import {AdapterLitElement} from '@dbp-toolkit/common'; import {Provider} from "@dbp-toolkit/provider"; import {createInstance, setOverrides} from './i18n.js'; diff --git a/packages/language-select/src/language-select.js b/packages/language-select/src/language-select.js index c3d988e4..2a63dda6 100644 --- a/packages/language-select/src/language-select.js +++ b/packages/language-select/src/language-select.js @@ -1,7 +1,7 @@ import {html, css} from 'lit'; import {createInstance} from './i18n.js'; import * as commonStyles from '@dbp-toolkit/common/styles'; -import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element"; +import {AdapterLitElement} from '@dbp-toolkit/common'; /** diff --git a/packages/person-select/src/person-select.js b/packages/person-select/src/person-select.js index 14e272a9..f56fc9b6 100644 --- a/packages/person-select/src/person-select.js +++ b/packages/person-select/src/person-select.js @@ -12,7 +12,7 @@ import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonStyles from '@dbp-toolkit/common/styles'; import select2CSSPath from 'select2/dist/css/select2.min.css'; import * as errorUtils from '@dbp-toolkit/common/error'; -import {AdapterLitElement} from '@dbp-toolkit/provider/src/adapter-lit-element'; +import {AdapterLitElement} from '@dbp-toolkit/common'; const personContext = { '@id': '@id', diff --git a/packages/provider/src/adapter-lit-element.js b/packages/provider/src/adapter-lit-element.js deleted file mode 100644 index f84ecd35..00000000 --- a/packages/provider/src/adapter-lit-element.js +++ /dev/null @@ -1 +0,0 @@ -export {AdapterLitElement} from '@dbp-toolkit/common'; diff --git a/packages/resource-select/src/resource-select.js b/packages/resource-select/src/resource-select.js index e2a82db5..ec19718c 100644 --- a/packages/resource-select/src/resource-select.js +++ b/packages/resource-select/src/resource-select.js @@ -7,7 +7,7 @@ import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonStyles from '@dbp-toolkit/common/styles'; import select2LangDe from '@dbp-toolkit/resource-select/src/i18n/de/select2'; import select2LangEn from '@dbp-toolkit/resource-select/src/i18n/en/select2'; -import {AdapterLitElement} from '@dbp-toolkit/provider/src/adapter-lit-element'; +import {AdapterLitElement} from '@dbp-toolkit/common'; import * as hydra from './hydra.js'; export class ResourceSelect extends AdapterLitElement { diff --git a/toolkit-showcase/src/dbp-auth-demo-activity.js b/toolkit-showcase/src/dbp-auth-demo-activity.js index 1e3df46f..e1507a9d 100644 --- a/toolkit-showcase/src/dbp-auth-demo-activity.js +++ b/toolkit-showcase/src/dbp-auth-demo-activity.js @@ -6,7 +6,7 @@ import * as commonStyles from '@dbp-toolkit/common/styles'; import {unsafeHTML} from 'lit/directives/unsafe-html.js'; import readme from '@dbp-toolkit/auth/README.md'; import * as demoStyles from './styles'; -import {AdapterLitElement} from '@dbp-toolkit/provider/src/adapter-lit-element'; +import {AdapterLitElement} from '@dbp-toolkit/common'; class DbpAuthDemoActivity extends ScopedElementsMixin(AdapterLitElement) { constructor() { diff --git a/toolkit-showcase/src/dbp-common-demo-activity.js b/toolkit-showcase/src/dbp-common-demo-activity.js index 2f959f9a..17bf1106 100644 --- a/toolkit-showcase/src/dbp-common-demo-activity.js +++ b/toolkit-showcase/src/dbp-common-demo-activity.js @@ -6,7 +6,7 @@ import * as commonStyles from '@dbp-toolkit/common/styles'; import {unsafeHTML} from 'lit/directives/unsafe-html.js'; import readme from '@dbp-toolkit/common/README.md'; import * as demoStyles from './styles'; -import {AdapterLitElement} from '@dbp-toolkit/provider/src/adapter-lit-element'; +import {AdapterLitElement} from '@dbp-toolkit/common'; class DbpCommonDemoActivity extends ScopedElementsMixin(AdapterLitElement) { constructor() { diff --git a/toolkit-showcase/src/dbp-data-table-view-demo-activity.js b/toolkit-showcase/src/dbp-data-table-view-demo-activity.js index ae4841e4..08ce1606 100644 --- a/toolkit-showcase/src/dbp-data-table-view-demo-activity.js +++ b/toolkit-showcase/src/dbp-data-table-view-demo-activity.js @@ -6,7 +6,7 @@ import * as commonStyles from '@dbp-toolkit/common/styles'; import {unsafeHTML} from 'lit/directives/unsafe-html.js'; import readme from '@dbp-toolkit/data-table-view/README.md'; import * as demoStyles from './styles'; -import {AdapterLitElement} from '@dbp-toolkit/provider/src/adapter-lit-element'; +import {AdapterLitElement} from '@dbp-toolkit/common'; class DbpActivityNameDemoActivity extends ScopedElementsMixin(AdapterLitElement) { //TODO diff --git a/toolkit-showcase/src/dbp-demo-template.js b/toolkit-showcase/src/dbp-demo-template.js index 7b19ef26..b5f207a9 100644 --- a/toolkit-showcase/src/dbp-demo-template.js +++ b/toolkit-showcase/src/dbp-demo-template.js @@ -6,7 +6,7 @@ import * as commonStyles from '@dbp-toolkit/common/styles'; import {unsafeHTML} from 'lit/directives/unsafe-html.js'; // import readme from '@dbp-toolkit/class-name/README.md'; TODO import * as demoStyles from './styles'; -import {AdapterLitElement} from '@dbp-toolkit/provider/src/adapter-lit-element'; +import {AdapterLitElement} from '@dbp-toolkit/common'; export class DbpActivityNameDemoActivity extends ScopedElementsMixin(AdapterLitElement) { //TODO diff --git a/toolkit-showcase/src/dbp-file-handling-demo-activity.js b/toolkit-showcase/src/dbp-file-handling-demo-activity.js index a1e88d8e..54c8ff9d 100644 --- a/toolkit-showcase/src/dbp-file-handling-demo-activity.js +++ b/toolkit-showcase/src/dbp-file-handling-demo-activity.js @@ -6,7 +6,7 @@ import * as commonUtils from '@dbp-toolkit/common/utils'; import {unsafeHTML} from 'lit/directives/unsafe-html.js'; import readme from '@dbp-toolkit/file-handling/README.md'; import * as demoStyles from './styles'; -import {AdapterLitElement} from '@dbp-toolkit/provider/src/adapter-lit-element'; +import {AdapterLitElement} from '@dbp-toolkit/common'; export class DbpFileHandlingDemoActivity extends ScopedElementsMixin(AdapterLitElement) { constructor() { diff --git a/toolkit-showcase/src/dbp-knowledge-base-web-page-element-view-demo-activity.js b/toolkit-showcase/src/dbp-knowledge-base-web-page-element-view-demo-activity.js index b0b4906c..c1de8d9f 100644 --- a/toolkit-showcase/src/dbp-knowledge-base-web-page-element-view-demo-activity.js +++ b/toolkit-showcase/src/dbp-knowledge-base-web-page-element-view-demo-activity.js @@ -6,7 +6,7 @@ import * as commonStyles from '@dbp-toolkit/common/styles'; import {unsafeHTML} from 'lit/directives/unsafe-html.js'; import readme from '@dbp-toolkit/knowledge-base-web-page-element-view/README.md'; import * as demoStyles from './styles'; -import {AdapterLitElement} from '@dbp-toolkit/provider/src/adapter-lit-element'; +import {AdapterLitElement} from '@dbp-toolkit/common'; class KnowledgeBaseWebPageElementViewDemoActivity extends ScopedElementsMixin(AdapterLitElement) { constructor() { diff --git a/toolkit-showcase/src/dbp-language-select-demo-activity.js b/toolkit-showcase/src/dbp-language-select-demo-activity.js index b8a693fe..e8260b67 100644 --- a/toolkit-showcase/src/dbp-language-select-demo-activity.js +++ b/toolkit-showcase/src/dbp-language-select-demo-activity.js @@ -6,7 +6,7 @@ import * as commonStyles from '@dbp-toolkit/common/styles'; import {unsafeHTML} from 'lit/directives/unsafe-html.js'; import readme from '@dbp-toolkit/language-select/README.md'; import * as demoStyles from './styles'; -import {AdapterLitElement} from '@dbp-toolkit/provider/src/adapter-lit-element'; +import {AdapterLitElement} from '@dbp-toolkit/common'; class DbpLanguageSelectDemoActivity extends ScopedElementsMixin(AdapterLitElement) { constructor() { diff --git a/toolkit-showcase/src/dbp-matomo-demo-activity.js b/toolkit-showcase/src/dbp-matomo-demo-activity.js index fbdb7a20..001ad5e5 100644 --- a/toolkit-showcase/src/dbp-matomo-demo-activity.js +++ b/toolkit-showcase/src/dbp-matomo-demo-activity.js @@ -6,7 +6,7 @@ import * as commonStyles from '@dbp-toolkit/common/styles'; import {unsafeHTML} from 'lit/directives/unsafe-html.js'; import readme from '@dbp-toolkit/matomo/README.md'; import * as demoStyles from './styles'; -import {AdapterLitElement} from '@dbp-toolkit/provider/src/adapter-lit-element'; +import {AdapterLitElement} from '@dbp-toolkit/common'; class DbpMatomoDemoActivity extends ScopedElementsMixin(AdapterLitElement) { constructor() { diff --git a/toolkit-showcase/src/dbp-notification-demo-activity.js b/toolkit-showcase/src/dbp-notification-demo-activity.js index 5aff1dab..40824654 100644 --- a/toolkit-showcase/src/dbp-notification-demo-activity.js +++ b/toolkit-showcase/src/dbp-notification-demo-activity.js @@ -6,7 +6,7 @@ import * as commonStyles from '@dbp-toolkit/common/styles'; import {unsafeHTML} from 'lit/directives/unsafe-html.js'; import readme from '@dbp-toolkit/notification/README.md'; import * as demoStyles from './styles'; -import {AdapterLitElement} from '@dbp-toolkit/provider/src/adapter-lit-element'; +import {AdapterLitElement} from '@dbp-toolkit/common'; class DbpNotificationDemoActivity extends ScopedElementsMixin(AdapterLitElement) { constructor() { diff --git a/toolkit-showcase/src/dbp-person-profile-demo-activity.js b/toolkit-showcase/src/dbp-person-profile-demo-activity.js index 5ca7aac9..dc7a8d8b 100644 --- a/toolkit-showcase/src/dbp-person-profile-demo-activity.js +++ b/toolkit-showcase/src/dbp-person-profile-demo-activity.js @@ -6,7 +6,7 @@ import * as commonStyles from '@dbp-toolkit/common/styles'; import {unsafeHTML} from 'lit/directives/unsafe-html.js'; import readme from '@dbp-toolkit/person-profile/README.md'; import * as demoStyles from './styles'; -import {AdapterLitElement} from '@dbp-toolkit/provider/src/adapter-lit-element'; +import {AdapterLitElement} from '@dbp-toolkit/common'; class DbpPersonProfileDemoActivity extends ScopedElementsMixin(AdapterLitElement) { constructor() { diff --git a/toolkit-showcase/src/dbp-person-select-demo-activity.js b/toolkit-showcase/src/dbp-person-select-demo-activity.js index 6dc5bbcd..167678c3 100644 --- a/toolkit-showcase/src/dbp-person-select-demo-activity.js +++ b/toolkit-showcase/src/dbp-person-select-demo-activity.js @@ -6,7 +6,7 @@ import * as commonStyles from '@dbp-toolkit/common/styles'; import {unsafeHTML} from 'lit/directives/unsafe-html.js'; import readme from '@dbp-toolkit/person-select/README.md'; import * as demoStyles from './styles'; -import {AdapterLitElement} from '@dbp-toolkit/provider/src/adapter-lit-element'; +import {AdapterLitElement} from '@dbp-toolkit/common'; class DbpPersonSelectDemoActivity extends ScopedElementsMixin(AdapterLitElement) { constructor() { diff --git a/toolkit-showcase/src/dbp-qr-code-scanner-demo-activity.js b/toolkit-showcase/src/dbp-qr-code-scanner-demo-activity.js index d4a26c46..68e11057 100644 --- a/toolkit-showcase/src/dbp-qr-code-scanner-demo-activity.js +++ b/toolkit-showcase/src/dbp-qr-code-scanner-demo-activity.js @@ -6,7 +6,7 @@ import * as commonStyles from '@dbp-toolkit/common/styles'; import {unsafeHTML} from 'lit/directives/unsafe-html.js'; import readme from '@dbp-toolkit/qr-code-scanner/README.md'; import * as demoStyles from './styles'; -import {AdapterLitElement} from '@dbp-toolkit/provider/src/adapter-lit-element'; +import {AdapterLitElement} from '@dbp-toolkit/common'; class DbpQrCodeScannerDemoActivity extends ScopedElementsMixin(AdapterLitElement) { constructor() { diff --git a/toolkit-showcase/src/dbp-resource-select-demo-activity.js b/toolkit-showcase/src/dbp-resource-select-demo-activity.js index 825e07db..7abae8ed 100644 --- a/toolkit-showcase/src/dbp-resource-select-demo-activity.js +++ b/toolkit-showcase/src/dbp-resource-select-demo-activity.js @@ -6,7 +6,7 @@ import * as commonStyles from '@dbp-toolkit/common/styles'; import {unsafeHTML} from 'lit/directives/unsafe-html.js'; import readme from '@dbp-toolkit/resource-select/README.md'; import * as demoStyles from './styles'; -import {AdapterLitElement} from '@dbp-toolkit/provider/src/adapter-lit-element'; +import {AdapterLitElement} from '@dbp-toolkit/common'; class DbpOrganizationSelectDemoActivity extends ScopedElementsMixin(AdapterLitElement) { constructor() { diff --git a/toolkit-showcase/src/dbp-theme-switcher-demo-activity.js b/toolkit-showcase/src/dbp-theme-switcher-demo-activity.js index 7ff3ca19..ee698cfc 100644 --- a/toolkit-showcase/src/dbp-theme-switcher-demo-activity.js +++ b/toolkit-showcase/src/dbp-theme-switcher-demo-activity.js @@ -6,7 +6,7 @@ import * as commonUtils from '@dbp-toolkit/common/utils'; import {unsafeHTML} from 'lit/directives/unsafe-html.js'; import readme from '@dbp-toolkit/theme-switcher/README.md'; import * as demoStyles from './styles'; -import {AdapterLitElement} from '@dbp-toolkit/provider/src/adapter-lit-element'; +import {AdapterLitElement} from '@dbp-toolkit/common'; export class DbpThemeSwitcherDemoActivity extends ScopedElementsMixin(AdapterLitElement) { constructor() { diff --git a/toolkit-showcase/src/dbp-tooltip-demo-activity.js b/toolkit-showcase/src/dbp-tooltip-demo-activity.js index 27bbdca7..db65e3e8 100644 --- a/toolkit-showcase/src/dbp-tooltip-demo-activity.js +++ b/toolkit-showcase/src/dbp-tooltip-demo-activity.js @@ -6,7 +6,7 @@ import * as commonStyles from '@dbp-toolkit/common/styles'; import {unsafeHTML} from 'lit/directives/unsafe-html.js'; import readme from '@dbp-toolkit/tooltip/README.md'; import * as demoStyles from './styles'; -import {AdapterLitElement} from '@dbp-toolkit/provider/src/adapter-lit-element'; +import {AdapterLitElement} from '@dbp-toolkit/common'; class DbpTooltipDemoActivity extends ScopedElementsMixin(AdapterLitElement) { constructor() { -- GitLab