From 82496a3478c6ca6aa8ee4244bfc119f46436562f Mon Sep 17 00:00:00 2001 From: Christoph Reiter <reiter.christoph@gmail.com> Date: Wed, 24 Nov 2021 10:31:39 +0100 Subject: [PATCH] Revert "Revert "Port to lit 2.0"" This reverts commit 6324718bed09e31cac034a37c44fbfb304d42dcd. --- packages/app-shell/package.json | 5 +- packages/app-shell/src/app-shell.js | 4 +- packages/app-shell/src/auth-menu-button.js | 4 +- packages/app-shell/src/build-info.js | 2 +- .../app-shell/src/dbp-activity-example.js | 2 +- .../app-shell/src/dbp-app-shell-welcome.js | 2 +- packages/app-shell/src/tugraz-logo.js | 2 +- packages/auth/package.json | 4 +- packages/auth/src/dbp-auth-demo.js | 2 +- packages/auth/src/login-button.js | 4 +- packages/check-in-place-select/package.json | 4 +- .../src/check-in-place-select.js | 2 +- .../src/dbp-check-in-place-select-demo.js | 2 +- packages/common/dbp-common-demo.js | 2 +- packages/common/package.json | 4 +- packages/common/src/adapter-lit-element.js | 2 +- packages/common/src/button.js | 2 +- packages/common/src/icon.js | 2 +- packages/common/src/inline-notification.js | 2 +- packages/common/src/mini-spinner.js | 2 +- packages/common/src/translated.js | 4 +- packages/common/styles.js | 2 +- packages/data-table-view/package.json | 5 +- .../data-table-view/src/data-table-view.js | 2 +- .../src/dbp-data-table-view-demo.js | 2 +- packages/file-handling/package.json | 5 +- packages/file-handling/src/clipboard.js | 4 +- packages/file-handling/src/demo.js | 4 +- packages/file-handling/src/file-sink.js | 4 +- packages/file-handling/src/file-source.js | 4 +- .../src/nextcloud-file-picker.js | 4 +- packages/file-handling/src/styles.js | 2 +- .../package.json | 5 +- ...owledge-base-web-page-element-view-demo.js | 2 +- .../knowledge-base-web-page-element-view.js | 4 +- packages/language-select/package.json | 4 +- .../src/dbp-language-select-demo.js | 2 +- .../language-select/src/language-select.js | 2 +- packages/matomo/package.json | 4 +- packages/matomo/src/dbp-matomo-demo.js | 2 +- packages/notification/package.json | 4 +- .../notification/src/dbp-notification-demo.js | 2 +- packages/notification/src/notification.js | 2 +- packages/organization-select/package.json | 4 +- .../src/dbp-organization-select-demo.js | 2 +- .../src/organization-select.js | 2 +- packages/person-profile/package.json | 4 +- .../src/dbp-person-profile-demo.js | 2 +- packages/person-profile/src/person-profile.js | 2 +- packages/person-select/package.json | 4 +- .../src/dbp-person-select-demo.js | 2 +- packages/person-select/src/person-select.js | 2 +- packages/provider/package.json | 4 +- packages/provider/src/dbp-provider-demo.js | 2 +- packages/qr-code-scanner/package.json | 4 +- .../src/dbp-qr-code-scanner-demo.js | 2 +- .../qr-code-scanner/src/qr-code-scanner.js | 4 +- packages/tooltip/package.json | 4 +- packages/tooltip/src/button-tooltip.js | 2 +- packages/tooltip/src/dbp-tooltip-demo.js | 2 +- packages/tooltip/src/info-tooltip.js | 2 +- packages/tooltip/src/tooltip.js | 2 +- packages/typescript-example/package.json | 4 +- .../src/dbp-typescript-example-demo.ts | 2 +- .../src/typescript-example.ts | 2 +- toolkit-showcase/package.json | 5 +- .../src/dbp-auth-demo-activity.js | 4 +- ...dbp-check-in-place-select-demo-activity.js | 4 +- .../src/dbp-common-demo-activity.js | 4 +- .../src/dbp-data-table-view-demo-activity.js | 4 +- toolkit-showcase/src/dbp-demo-template.js | 4 +- .../src/dbp-file-handling-demo-activity.js | 4 +- ...ase-web-page-element-view-demo-activity.js | 4 +- .../src/dbp-language-select-demo-activity.js | 4 +- .../src/dbp-matomo-demo-activity.js | 4 +- .../src/dbp-notification-demo-activity.js | 4 +- .../dbp-organization-select-demo-activity.js | 4 +- .../src/dbp-person-profile-demo-activity.js | 4 +- .../src/dbp-person-select-demo-activity.js | 4 +- .../src/dbp-qr-code-scanner-demo-activity.js | 4 +- .../src/dbp-tooltip-demo-activity.js | 4 +- toolkit-showcase/src/styles.js | 2 +- yarn.lock | 56 ++++++++++++++----- 83 files changed, 168 insertions(+), 145 deletions(-) diff --git a/packages/app-shell/package.json b/packages/app-shell/package.json index 17fa69ce..882442d8 100644 --- a/packages/app-shell/package.json +++ b/packages/app-shell/package.json @@ -40,10 +40,9 @@ "@dbp-toolkit/matomo": "^0.2.2", "@dbp-toolkit/notification": "^0.2.2", "@dbp-toolkit/person-profile": "^0.2.2", - "@open-wc/scoped-elements": "^1.3.3", + "@open-wc/scoped-elements": "^2.0.0", "i18next": "^21.4.2", - "lit-element": "^2.4.0", - "lit-html": "^1.3.0", + "lit": "^2.0.0", "universal-router": "^9.0.1" }, "scripts": { diff --git a/packages/app-shell/src/app-shell.js b/packages/app-shell/src/app-shell.js index 5014ccad..c16c4c5e 100644 --- a/packages/app-shell/src/app-shell.js +++ b/packages/app-shell/src/app-shell.js @@ -1,5 +1,5 @@ import {createInstance} from './i18n.js'; -import {html, css} from 'lit-element'; +import {html, css} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {LanguageSelect} from '@dbp-toolkit/language-select'; import {Icon} from '@dbp-toolkit/common'; @@ -7,7 +7,7 @@ import {AuthKeycloak} from '@dbp-toolkit/auth'; import {AuthMenuButton} from './auth-menu-button.js'; import {Notification} from '@dbp-toolkit/notification'; import * as commonStyles from '@dbp-toolkit/common/styles'; -import {classMap} from 'lit-html/directives/class-map.js'; +import {classMap} from 'lit/directives/class-map.js'; import {Router} from './router.js'; import {BuildInfo} from './build-info.js'; import {send as notify} from '@dbp-toolkit/common/notification'; diff --git a/packages/app-shell/src/auth-menu-button.js b/packages/app-shell/src/auth-menu-button.js index 3bce2204..d2baef34 100644 --- a/packages/app-shell/src/auth-menu-button.js +++ b/packages/app-shell/src/auth-menu-button.js @@ -1,6 +1,6 @@ import {createInstance} from './i18n.js'; -import {html, css} from 'lit-element'; -import {unsafeHTML} from 'lit-html/directives/unsafe-html.js'; +import {html, css} from 'lit'; +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'; diff --git a/packages/app-shell/src/build-info.js b/packages/app-shell/src/build-info.js index 30bb73d3..375f3a1e 100644 --- a/packages/app-shell/src/build-info.js +++ b/packages/app-shell/src/build-info.js @@ -1,4 +1,4 @@ -import {html, css} from 'lit-element'; +import {html, css} from 'lit'; import * as commonStyles from '@dbp-toolkit/common/styles'; import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element"; diff --git a/packages/app-shell/src/dbp-activity-example.js b/packages/app-shell/src/dbp-activity-example.js index e126445b..aeb7c78f 100644 --- a/packages/app-shell/src/dbp-activity-example.js +++ b/packages/app-shell/src/dbp-activity-example.js @@ -1,4 +1,4 @@ -import {html , LitElement} from 'lit-element'; +import {html , LitElement} from 'lit'; import {createInstance} from './i18n.js'; import * as commonUtils from '@dbp-toolkit/common/utils'; diff --git a/packages/app-shell/src/dbp-app-shell-welcome.js b/packages/app-shell/src/dbp-app-shell-welcome.js index 00d2bd92..f2c033a3 100644 --- a/packages/app-shell/src/dbp-app-shell-welcome.js +++ b/packages/app-shell/src/dbp-app-shell-welcome.js @@ -1,5 +1,5 @@ import {createInstance} from './i18n.js'; -import {css, html, LitElement} from 'lit-element'; +import {css, html, LitElement} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonStyles from '@dbp-toolkit/common/styles'; diff --git a/packages/app-shell/src/tugraz-logo.js b/packages/app-shell/src/tugraz-logo.js index 7ea634bc..cf693813 100644 --- a/packages/app-shell/src/tugraz-logo.js +++ b/packages/app-shell/src/tugraz-logo.js @@ -1,4 +1,4 @@ -import {html, css} from 'lit-element'; +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"; diff --git a/packages/auth/package.json b/packages/auth/package.json index ed602cdf..0cde8e8b 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -37,9 +37,9 @@ }, "dependencies": { "@dbp-toolkit/common": "^0.2.12", - "@open-wc/scoped-elements": "^1.3.3", + "@open-wc/scoped-elements": "^2.0.0", "event-target-shim": "^6.0.0", - "lit-element": "^2.4.0" + "lit": "^2.0.0" }, "scripts": { "clean": "rm dist/*", diff --git a/packages/auth/src/dbp-auth-demo.js b/packages/auth/src/dbp-auth-demo.js index fee38c5c..59cfa4e2 100644 --- a/packages/auth/src/dbp-auth-demo.js +++ b/packages/auth/src/dbp-auth-demo.js @@ -1,5 +1,5 @@ import {createInstance} from './i18n.js'; -import {html} from 'lit-element'; +import {html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {AuthKeycloak} from './auth-keycloak.js'; import {LoginButton} from './login-button.js'; diff --git a/packages/auth/src/login-button.js b/packages/auth/src/login-button.js index 55423562..371b5064 100644 --- a/packages/auth/src/login-button.js +++ b/packages/auth/src/login-button.js @@ -1,6 +1,6 @@ import {createInstance} from './i18n.js'; -import {html, css} from 'lit-element'; -import {unsafeHTML} from 'lit-html/directives/unsafe-html.js'; +import {html, css} from 'lit'; +import {unsafeHTML} from 'lit/directives/unsafe-html.js'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import * as commonStyles from '@dbp-toolkit/common/styles'; import {LoginStatus} from './util.js'; diff --git a/packages/check-in-place-select/package.json b/packages/check-in-place-select/package.json index b7a81e0d..934eb16d 100644 --- a/packages/check-in-place-select/package.json +++ b/packages/check-in-place-select/package.json @@ -37,9 +37,9 @@ "dependencies": { "@dbp-toolkit/auth": "^0.2.2", "@dbp-toolkit/common": "^0.2.2", - "@open-wc/scoped-elements": "^1.3.3", + "@open-wc/scoped-elements": "^2.0.0", "jquery": "^3.4.1", - "lit-element": "^2.4.0", + "lit": "^2.0.0", "select2": "^4.0.10" }, "scripts": { diff --git a/packages/check-in-place-select/src/check-in-place-select.js b/packages/check-in-place-select/src/check-in-place-select.js index 777d5900..93036eec 100644 --- a/packages/check-in-place-select/src/check-in-place-select.js +++ b/packages/check-in-place-select/src/check-in-place-select.js @@ -2,7 +2,7 @@ import {findObjectInApiResults} from './utils.js'; import select2LangDe from './i18n/de/select2'; import select2LangEn from './i18n/en/select2'; import JSONLD from '@dbp-toolkit/common/jsonld'; -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {createInstance} from './i18n.js'; import {Icon} from '@dbp-toolkit/common'; diff --git a/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js b/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js index 7f63b6d9..6e4d1bef 100644 --- a/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js +++ b/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js @@ -1,4 +1,4 @@ -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {CheckInPlaceSelect} from './check-in-place-select.js'; import {AuthKeycloak, LoginButton} from '@dbp-toolkit/auth'; diff --git a/packages/common/dbp-common-demo.js b/packages/common/dbp-common-demo.js index cd963272..914f6200 100644 --- a/packages/common/dbp-common-demo.js +++ b/packages/common/dbp-common-demo.js @@ -1,5 +1,5 @@ import {createInstance} from './src/i18n.js'; -import {css, html, LitElement} from 'lit-element'; +import {css, html, LitElement} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import * as commonUtils from './utils.js'; import * as commonStyles from './styles.js'; diff --git a/packages/common/package.json b/packages/common/package.json index d622a708..28a276f0 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -37,9 +37,9 @@ "lint": "eslint ." }, "dependencies": { - "@open-wc/scoped-elements": "^1.3.3", + "@open-wc/scoped-elements": "^2.0.0", "@sentry/browser": "^6.0.0", "i18next": "^21.4.2", - "lit-element": "^2.4.0" + "lit": "^2.0.0" } } diff --git a/packages/common/src/adapter-lit-element.js b/packages/common/src/adapter-lit-element.js index 640cc18e..023deced 100644 --- a/packages/common/src/adapter-lit-element.js +++ b/packages/common/src/adapter-lit-element.js @@ -1,4 +1,4 @@ -import {LitElement} from "lit-element"; +import {LitElement} from "lit"; import {Logger} from "./logger"; export class AdapterLitElement extends LitElement { diff --git a/packages/common/src/button.js b/packages/common/src/button.js index 2eca7ae4..eb4a7933 100644 --- a/packages/common/src/button.js +++ b/packages/common/src/button.js @@ -1,4 +1,4 @@ -import {html, LitElement, css} from 'lit-element'; +import {html, LitElement, css} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {MiniSpinner} from './mini-spinner.js'; import * as commonStyles from '../styles.js'; diff --git a/packages/common/src/icon.js b/packages/common/src/icon.js index 965614dc..98d94c08 100644 --- a/packages/common/src/icon.js +++ b/packages/common/src/icon.js @@ -1,4 +1,4 @@ -import {html, LitElement, css} from 'lit-element'; +import {html, LitElement, css} from 'lit'; import * as commonUtils from '../utils.js'; import {name as pkgName} from './../package.json'; diff --git a/packages/common/src/inline-notification.js b/packages/common/src/inline-notification.js index 01ae829c..fa11ba46 100644 --- a/packages/common/src/inline-notification.js +++ b/packages/common/src/inline-notification.js @@ -1,4 +1,4 @@ -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import DBPLitElement from '../dbp-lit-element'; import * as commonStyles from '../styles'; diff --git a/packages/common/src/mini-spinner.js b/packages/common/src/mini-spinner.js index f03d734d..5dfe9db8 100644 --- a/packages/common/src/mini-spinner.js +++ b/packages/common/src/mini-spinner.js @@ -1,4 +1,4 @@ -import {html, LitElement, css} from 'lit-element'; +import {html, LitElement, css} from 'lit'; export class MiniSpinner extends LitElement { constructor() { diff --git a/packages/common/src/translated.js b/packages/common/src/translated.js index 31a93bc7..5739ba98 100644 --- a/packages/common/src/translated.js +++ b/packages/common/src/translated.js @@ -1,5 +1,5 @@ -import {css, html} from 'lit-element'; -import {classMap} from "lit-html/directives/class-map"; +import {css, html} from 'lit'; +import {classMap} from 'lit/directives/class-map.js'; import DBPLitElement from "../dbp-lit-element"; export class Translated extends DBPLitElement { diff --git a/packages/common/styles.js b/packages/common/styles.js index cfd72fcb..5e106727 100644 --- a/packages/common/styles.js +++ b/packages/common/styles.js @@ -1,4 +1,4 @@ -import {css, unsafeCSS, CSSResult} from 'lit-element'; +import {css, unsafeCSS, CSSResult} from 'lit'; import {getIconSVGURL} from './src/icon.js'; /** diff --git a/packages/data-table-view/package.json b/packages/data-table-view/package.json index 529784be..54980813 100644 --- a/packages/data-table-view/package.json +++ b/packages/data-table-view/package.json @@ -36,7 +36,7 @@ "dependencies": { "@dbp-toolkit/auth": "^0.2.2", "@dbp-toolkit/common": "^0.2.2", - "@open-wc/scoped-elements": "^1.3.3", + "@open-wc/scoped-elements": "^2.0.0", "datatables.net-buttons": "^2.0.0", "datatables.net-buttons-dt": "^2.0.0", "datatables.net-dt": "^1.10.20", @@ -45,8 +45,7 @@ "i18next": "^21.4.2", "jquery": "^3.4.1", "jszip": "^3.2.2", - "lit-element": "^2.4.0", - "lit-html": "^1.3.0" + "lit": "^2.0.0" }, "scripts": { "clean": "rm -r dist/*", diff --git a/packages/data-table-view/src/data-table-view.js b/packages/data-table-view/src/data-table-view.js index 609e642c..4684f38e 100644 --- a/packages/data-table-view/src/data-table-view.js +++ b/packages/data-table-view/src/data-table-view.js @@ -8,7 +8,7 @@ import bttn2 from 'datatables.net-buttons'; import bttnHtml5 from 'datatables.net-buttons/js/buttons.html5.js'; import bttnPrint from 'datatables.net-buttons/js/buttons.print.js'; import {createInstance} from './i18n'; -import {css, html, unsafeCSS} from 'lit-element'; +import {css, html, unsafeCSS} from 'lit'; import de from '../assets/datatables/i18n/German'; import en from '../assets/datatables/i18n/English'; import {getIconSVGURL} from '@dbp-toolkit/common'; diff --git a/packages/data-table-view/src/dbp-data-table-view-demo.js b/packages/data-table-view/src/dbp-data-table-view-demo.js index 7b0bf912..09b147a2 100644 --- a/packages/data-table-view/src/dbp-data-table-view-demo.js +++ b/packages/data-table-view/src/dbp-data-table-view-demo.js @@ -1,7 +1,7 @@ import {AuthKeycloak, LoginButton} from '@dbp-toolkit/auth'; import {DataTableView} from './data-table-view.js'; import {createInstance} from './i18n'; -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonStyles from '@dbp-toolkit/common/styles'; diff --git a/packages/file-handling/package.json b/packages/file-handling/package.json index 5286a245..043b9b15 100644 --- a/packages/file-handling/package.json +++ b/packages/file-handling/package.json @@ -34,13 +34,12 @@ }, "dependencies": { "@dbp-toolkit/common": "^0.2.2", - "@open-wc/scoped-elements": "^1.3.3", + "@open-wc/scoped-elements": "^2.0.0", "file-saver": "^2.0.2", "i18next": "^21.4.2", "jose": "^4.0.0", "jszip": "^3.5.0", - "lit-element": "^2.1.0", - "lit-html": "^1.3.0", + "lit": "^2.0.0", "material-design-icons-svg": "^3.0.0", "tabulator-tables": "^4.8.4", "webdav": "^3.6.1" diff --git a/packages/file-handling/src/clipboard.js b/packages/file-handling/src/clipboard.js index 15cb2128..52668785 100644 --- a/packages/file-handling/src/clipboard.js +++ b/packages/file-handling/src/clipboard.js @@ -1,5 +1,5 @@ import {createInstance} from './i18n'; -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonStyles from '@dbp-toolkit/common/styles'; @@ -10,7 +10,7 @@ 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 {classMap} from 'lit-html/directives/class-map.js'; +import {classMap} from 'lit/directives/class-map.js'; const MODE_TABLE_ONLY = "table-only"; const MODE_FILE_SINK = "file-sink"; diff --git a/packages/file-handling/src/demo.js b/packages/file-handling/src/demo.js index e723a9a9..31d13488 100644 --- a/packages/file-handling/src/demo.js +++ b/packages/file-handling/src/demo.js @@ -1,6 +1,6 @@ import {createInstance} from './i18n'; -import {html, LitElement} from 'lit-element'; -import {unsafeHTML} from 'lit-html/directives/unsafe-html.js'; +import {html, LitElement} from 'lit'; +import {unsafeHTML} from 'lit/directives/unsafe-html.js'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {FileSource} from './file-source.js'; import {FileSink} from './file-sink.js'; diff --git a/packages/file-handling/src/file-sink.js b/packages/file-handling/src/file-sink.js index 9ddb9b97..fd79c506 100644 --- a/packages/file-handling/src/file-sink.js +++ b/packages/file-handling/src/file-sink.js @@ -1,11 +1,11 @@ import {createInstance} from './i18n'; -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import * as commonUtils from "@dbp-toolkit/common/utils"; import {Icon, MiniSpinner} from '@dbp-toolkit/common'; import * as commonStyles from '@dbp-toolkit/common/styles'; import {NextcloudFilePicker} from "./nextcloud-file-picker"; -import {classMap} from 'lit-html/directives/class-map.js'; +import {classMap} from 'lit/directives/class-map.js'; import FileSaver from 'file-saver'; import MicroModal from "./micromodal.es"; import * as fileHandlingStyles from './styles'; diff --git a/packages/file-handling/src/file-source.js b/packages/file-handling/src/file-source.js index bbe713d7..092128c3 100644 --- a/packages/file-handling/src/file-source.js +++ b/packages/file-handling/src/file-source.js @@ -1,12 +1,12 @@ import {createInstance} from './i18n'; -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import * as commonUtils from "@dbp-toolkit/common/utils"; import {Icon, MiniSpinner} from '@dbp-toolkit/common'; import {send} from "@dbp-toolkit/common/notification"; import * as commonStyles from '@dbp-toolkit/common/styles'; import {NextcloudFilePicker} from "./nextcloud-file-picker"; -import {classMap} from 'lit-html/directives/class-map.js'; +import {classMap} from 'lit/directives/class-map.js'; import MicroModal from './micromodal.es'; import * as fileHandlingStyles from './styles'; import {Clipboard} from "@dbp-toolkit/file-handling/src/clipboard"; diff --git a/packages/file-handling/src/nextcloud-file-picker.js b/packages/file-handling/src/nextcloud-file-picker.js index 17368135..09e00a4d 100644 --- a/packages/file-handling/src/nextcloud-file-picker.js +++ b/packages/file-handling/src/nextcloud-file-picker.js @@ -1,12 +1,12 @@ import {createInstance} from './i18n'; -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import DBPLitElement from '@dbp-toolkit/common/dbp-lit-element'; import {Icon, MiniSpinner} from '@dbp-toolkit/common'; import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonStyles from '@dbp-toolkit/common/styles'; import {createClient} from 'webdav/web'; -import {classMap} from 'lit-html/directives/class-map.js'; +import {classMap} from 'lit/directives/class-map.js'; import {humanFileSize} from '@dbp-toolkit/common/i18next'; import Tabulator from 'tabulator-tables'; import MicroModal from './micromodal.es'; diff --git a/packages/file-handling/src/styles.js b/packages/file-handling/src/styles.js index ec1e14f0..1175fe3a 100644 --- a/packages/file-handling/src/styles.js +++ b/packages/file-handling/src/styles.js @@ -1,4 +1,4 @@ -import {css} from 'lit-element'; +import {css} from 'lit'; export function getFileHandlingCss() { // language=css diff --git a/packages/knowledge-base-web-page-element-view/package.json b/packages/knowledge-base-web-page-element-view/package.json index 1d75dd89..f7d85fc3 100644 --- a/packages/knowledge-base-web-page-element-view/package.json +++ b/packages/knowledge-base-web-page-element-view/package.json @@ -36,10 +36,9 @@ "dependencies": { "@dbp-toolkit/auth": "^0.2.2", "@dbp-toolkit/common": "^0.2.2", - "@open-wc/scoped-elements": "^1.3.3", + "@open-wc/scoped-elements": "^2.0.0", "i18next": "^21.4.2", - "lit-element": "^2.4.0", - "lit-html": "^1.3.0", + "lit": "^2.0.0", "material-design-icons-svg": "^3.0.0" }, "scripts": { diff --git a/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js b/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js index 60f1e05a..6c72e009 100644 --- a/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js +++ b/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js @@ -1,5 +1,5 @@ import {createInstance} from './i18n'; -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {AuthKeycloak, LoginButton} from '@dbp-toolkit/auth'; import {KnowledgeBaseWebPageElementView} from './knowledge-base-web-page-element-view.js'; 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 57234041..45b06559 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 @@ -1,9 +1,9 @@ import {createInstance} from './i18n'; -import {html} from 'lit-element'; +import {html} from 'lit'; 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-html/directives/unsafe-html.js'; +import {unsafeHTML} from 'lit/directives/unsafe-html.js'; import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element"; /** diff --git a/packages/language-select/package.json b/packages/language-select/package.json index 4b58b687..904d368b 100644 --- a/packages/language-select/package.json +++ b/packages/language-select/package.json @@ -34,8 +34,8 @@ }, "dependencies": { "@dbp-toolkit/common": "^0.2.2", - "@open-wc/scoped-elements": "^1.3.3", - "lit-element": "^2.4.0" + "@open-wc/scoped-elements": "^2.0.0", + "lit": "^2.0.0" }, "scripts": { "clean": "rm dist/*", diff --git a/packages/language-select/src/dbp-language-select-demo.js b/packages/language-select/src/dbp-language-select-demo.js index 11b1264a..cd0ade8c 100644 --- a/packages/language-select/src/dbp-language-select-demo.js +++ b/packages/language-select/src/dbp-language-select-demo.js @@ -1,4 +1,4 @@ -import {html} from 'lit-element'; +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'; diff --git a/packages/language-select/src/language-select.js b/packages/language-select/src/language-select.js index b5f06f21..79f7f5b6 100644 --- a/packages/language-select/src/language-select.js +++ b/packages/language-select/src/language-select.js @@ -1,4 +1,4 @@ -import {html, css} from 'lit-element'; +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"; diff --git a/packages/matomo/package.json b/packages/matomo/package.json index 3e761878..62968690 100644 --- a/packages/matomo/package.json +++ b/packages/matomo/package.json @@ -36,8 +36,8 @@ "dependencies": { "@dbp-toolkit/auth": "^0.2.2", "@dbp-toolkit/common": "^0.2.2", - "@open-wc/scoped-elements": "^1.3.3", - "lit-element": "^2.4.0" + "@open-wc/scoped-elements": "^2.0.0", + "lit": "^2.0.0" }, "scripts": { "clean": "rm dist/*", diff --git a/packages/matomo/src/dbp-matomo-demo.js b/packages/matomo/src/dbp-matomo-demo.js index eced8a94..476682ad 100644 --- a/packages/matomo/src/dbp-matomo-demo.js +++ b/packages/matomo/src/dbp-matomo-demo.js @@ -1,5 +1,5 @@ import {createInstance} from './i18n.js'; -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {AuthKeycloak, LoginButton} from '@dbp-toolkit/auth'; import * as commonUtils from '@dbp-toolkit/common/utils'; diff --git a/packages/notification/package.json b/packages/notification/package.json index a7d95ef5..2cc8d464 100644 --- a/packages/notification/package.json +++ b/packages/notification/package.json @@ -35,8 +35,8 @@ }, "dependencies": { "@dbp-toolkit/common": "^0.2.2", - "@open-wc/scoped-elements": "^1.3.3", - "lit-element": "^2.4.0" + "@open-wc/scoped-elements": "^2.0.0", + "lit": "^2.0.0" }, "scripts": { "clean": "rm dist/*", diff --git a/packages/notification/src/dbp-notification-demo.js b/packages/notification/src/dbp-notification-demo.js index 8919e31f..b9155949 100644 --- a/packages/notification/src/dbp-notification-demo.js +++ b/packages/notification/src/dbp-notification-demo.js @@ -1,6 +1,6 @@ import {createInstance} from './i18n'; import {send as notify} from '@dbp-toolkit/common/notification'; -import {css, html, LitElement} from 'lit-element'; +import {css, html, LitElement} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {Notification} from './notification.js'; import * as commonUtils from '@dbp-toolkit/common/utils'; diff --git a/packages/notification/src/notification.js b/packages/notification/src/notification.js index 76a9c7a7..1041c45e 100644 --- a/packages/notification/src/notification.js +++ b/packages/notification/src/notification.js @@ -1,6 +1,6 @@ import {createInstance} from './i18n'; import {createUUID} from './utils'; -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import DBPLitElement from '@dbp-toolkit/common/dbp-lit-element'; import * as commonStyles from '@dbp-toolkit/common/styles'; diff --git a/packages/organization-select/package.json b/packages/organization-select/package.json index aea5118f..c9a8289b 100644 --- a/packages/organization-select/package.json +++ b/packages/organization-select/package.json @@ -37,9 +37,9 @@ "dependencies": { "@dbp-toolkit/auth": "^0.2.2", "@dbp-toolkit/common": "^0.2.2", - "@open-wc/scoped-elements": "^1.3.3", + "@open-wc/scoped-elements": "^2.0.0", "jquery": "^3.4.1", - "lit-element": "^2.4.0", + "lit": "^2.0.0", "select2": "^4.0.10" }, "scripts": { diff --git a/packages/organization-select/src/dbp-organization-select-demo.js b/packages/organization-select/src/dbp-organization-select-demo.js index e9146094..e397c14f 100644 --- a/packages/organization-select/src/dbp-organization-select-demo.js +++ b/packages/organization-select/src/dbp-organization-select-demo.js @@ -1,5 +1,5 @@ import {createInstance} from './i18n.js'; -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {OrganizationSelect} from './organization-select.js'; import {AuthKeycloak, LoginButton} from '@dbp-toolkit/auth'; diff --git a/packages/organization-select/src/organization-select.js b/packages/organization-select/src/organization-select.js index d60b4a8f..f069a904 100644 --- a/packages/organization-select/src/organization-select.js +++ b/packages/organization-select/src/organization-select.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import select2 from 'select2'; import select2CSSPath from 'select2/dist/css/select2.min.css'; import {createInstance} from './i18n.js'; -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonStyles from '@dbp-toolkit/common/styles'; import select2LangDe from "@dbp-toolkit/organization-select/src/i18n/de/select2"; diff --git a/packages/person-profile/package.json b/packages/person-profile/package.json index 5332eb9a..d649ce39 100644 --- a/packages/person-profile/package.json +++ b/packages/person-profile/package.json @@ -37,9 +37,9 @@ "@dbp-toolkit/auth": "^0.2.2", "@dbp-toolkit/common": "^0.2.2", "@dbp-toolkit/person-select": "^0.2.2", - "@open-wc/scoped-elements": "^1.3.3", + "@open-wc/scoped-elements": "^2.0.0", "jquery": "^3.4.1", - "lit-element": "^2.4.0" + "lit": "^2.0.0" }, "scripts": { "clean": "rm dist/*", diff --git a/packages/person-profile/src/dbp-person-profile-demo.js b/packages/person-profile/src/dbp-person-profile-demo.js index 2482af9e..cd6fbf9f 100644 --- a/packages/person-profile/src/dbp-person-profile-demo.js +++ b/packages/person-profile/src/dbp-person-profile-demo.js @@ -1,6 +1,6 @@ import {AuthKeycloak, LoginButton} from '@dbp-toolkit/auth'; import {createInstance} from './i18n.js'; -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import DBPLitElement from '@dbp-toolkit/common/dbp-lit-element'; import {PersonProfile} from './index.js'; diff --git a/packages/person-profile/src/person-profile.js b/packages/person-profile/src/person-profile.js index 649b8df3..c6b5c376 100644 --- a/packages/person-profile/src/person-profile.js +++ b/packages/person-profile/src/person-profile.js @@ -1,6 +1,6 @@ import JSONLD from '@dbp-toolkit/common/jsonld'; -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {createInstance} from './i18n.js'; import DBPLitElement from '@dbp-toolkit/common/dbp-lit-element'; import * as commonStyles from '@dbp-toolkit/common/styles'; diff --git a/packages/person-select/package.json b/packages/person-select/package.json index c50f0c26..6e078f4b 100644 --- a/packages/person-select/package.json +++ b/packages/person-select/package.json @@ -37,9 +37,9 @@ "dependencies": { "@dbp-toolkit/auth": "^0.2.2", "@dbp-toolkit/common": "^0.2.2", - "@open-wc/scoped-elements": "^1.3.3", + "@open-wc/scoped-elements": "^2.0.0", "jquery": "^3.4.1", - "lit-element": "^2.4.0", + "lit": "^2.0.0", "select2": "^4.0.10" }, "scripts": { diff --git a/packages/person-select/src/dbp-person-select-demo.js b/packages/person-select/src/dbp-person-select-demo.js index c63d6892..cf817ceb 100644 --- a/packages/person-select/src/dbp-person-select-demo.js +++ b/packages/person-select/src/dbp-person-select-demo.js @@ -1,5 +1,5 @@ import {createInstance} from './i18n.js'; -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {PersonSelect} from './person-select.js'; import {AuthKeycloak, LoginButton} from '@dbp-toolkit/auth'; diff --git a/packages/person-select/src/person-select.js b/packages/person-select/src/person-select.js index 7de890b5..561dfaf4 100644 --- a/packages/person-select/src/person-select.js +++ b/packages/person-select/src/person-select.js @@ -4,7 +4,7 @@ import select2 from 'select2'; import select2LangDe from './i18n/de/select2'; import select2LangEn from './i18n/en/select2'; import JSONLD from '@dbp-toolkit/common/jsonld'; -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {createInstance} from './i18n.js'; import {Icon} from '@dbp-toolkit/common'; diff --git a/packages/provider/package.json b/packages/provider/package.json index d3755d58..47f2b0b3 100644 --- a/packages/provider/package.json +++ b/packages/provider/package.json @@ -37,8 +37,8 @@ "dependencies": { "@dbp-toolkit/auth": "^0.2.5", "@dbp-toolkit/common": "^0.2.12", - "@open-wc/scoped-elements": "^1.3.3", - "lit-element": "^2.4.0" + "@open-wc/scoped-elements": "^2.0.0", + "lit": "^2.0.0" }, "scripts": { "clean": "rm dist/*", diff --git a/packages/provider/src/dbp-provider-demo.js b/packages/provider/src/dbp-provider-demo.js index 447832f4..822a5299 100644 --- a/packages/provider/src/dbp-provider-demo.js +++ b/packages/provider/src/dbp-provider-demo.js @@ -1,5 +1,5 @@ import {createInstance} from './i18n.js'; -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {AuthKeycloak, LoginButton} from '@dbp-toolkit/auth'; import * as commonUtils from '@dbp-toolkit/common/utils'; diff --git a/packages/qr-code-scanner/package.json b/packages/qr-code-scanner/package.json index a4354b09..dc2d5475 100644 --- a/packages/qr-code-scanner/package.json +++ b/packages/qr-code-scanner/package.json @@ -36,9 +36,9 @@ }, "dependencies": { "@dbp-toolkit/common": "^0.2.2", - "@open-wc/scoped-elements": "^1.3.3", + "@open-wc/scoped-elements": "^2.0.0", "async-mutex": "^0.3.0", - "lit-element": "^2.4.0", + "lit": "^2.0.0", "qr-scanner": "^1.2.0" }, "scripts": { diff --git a/packages/qr-code-scanner/src/dbp-qr-code-scanner-demo.js b/packages/qr-code-scanner/src/dbp-qr-code-scanner-demo.js index 2b78a740..4acc903c 100644 --- a/packages/qr-code-scanner/src/dbp-qr-code-scanner-demo.js +++ b/packages/qr-code-scanner/src/dbp-qr-code-scanner-demo.js @@ -1,5 +1,5 @@ import {createInstance} from './i18n'; -import {css, html, LitElement} from 'lit-element'; +import {css, html, LitElement} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonStyles from "@dbp-toolkit/common/styles"; diff --git a/packages/qr-code-scanner/src/qr-code-scanner.js b/packages/qr-code-scanner/src/qr-code-scanner.js index 4b07ef01..e4dfb11a 100644 --- a/packages/qr-code-scanner/src/qr-code-scanner.js +++ b/packages/qr-code-scanner/src/qr-code-scanner.js @@ -1,10 +1,10 @@ import {createInstance} from './i18n'; -import {css, html, unsafeCSS} from 'lit-element'; +import {css, html, unsafeCSS} from 'lit'; import DBPLitElement from '@dbp-toolkit/common/dbp-lit-element'; import * as commonStyles from '@dbp-toolkit/common/styles'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {Icon, MiniSpinner} from '@dbp-toolkit/common'; -import {classMap} from 'lit-html/directives/class-map.js'; +import {classMap} from 'lit/directives/class-map.js'; import * as commonUtils from '@dbp-toolkit/common/utils'; import {getIconSVGURL} from '@dbp-toolkit/common'; import {Mutex} from 'async-mutex'; diff --git a/packages/tooltip/package.json b/packages/tooltip/package.json index a027ac25..4a5a8b87 100644 --- a/packages/tooltip/package.json +++ b/packages/tooltip/package.json @@ -37,8 +37,8 @@ "dependencies": { "@dbp-toolkit/auth": "^0.2.2", "@dbp-toolkit/common": "^0.2.2", - "@open-wc/scoped-elements": "^1.3.3", - "lit-element": "^2.4.0", + "@open-wc/scoped-elements": "^2.0.0", + "lit": "^2.0.0", "tippy.js": "^6.3.1" }, "scripts": { diff --git a/packages/tooltip/src/button-tooltip.js b/packages/tooltip/src/button-tooltip.js index 2a37ba57..53b3d2b0 100644 --- a/packages/tooltip/src/button-tooltip.js +++ b/packages/tooltip/src/button-tooltip.js @@ -1,4 +1,4 @@ -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonStyles from '@dbp-toolkit/common/styles'; diff --git a/packages/tooltip/src/dbp-tooltip-demo.js b/packages/tooltip/src/dbp-tooltip-demo.js index 2b4d4c14..595b50f7 100644 --- a/packages/tooltip/src/dbp-tooltip-demo.js +++ b/packages/tooltip/src/dbp-tooltip-demo.js @@ -1,5 +1,5 @@ import {createInstance} from './i18n.js'; -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonStyles from '@dbp-toolkit/common/styles'; diff --git a/packages/tooltip/src/info-tooltip.js b/packages/tooltip/src/info-tooltip.js index 300701b9..4d3af000 100644 --- a/packages/tooltip/src/info-tooltip.js +++ b/packages/tooltip/src/info-tooltip.js @@ -1,4 +1,4 @@ -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonStyles from '@dbp-toolkit/common/styles'; diff --git a/packages/tooltip/src/tooltip.js b/packages/tooltip/src/tooltip.js index e9c27e90..3dc58636 100644 --- a/packages/tooltip/src/tooltip.js +++ b/packages/tooltip/src/tooltip.js @@ -1,4 +1,4 @@ -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonStyles from '@dbp-toolkit/common/styles'; diff --git a/packages/typescript-example/package.json b/packages/typescript-example/package.json index d4cc82f7..6a476092 100644 --- a/packages/typescript-example/package.json +++ b/packages/typescript-example/package.json @@ -38,8 +38,8 @@ }, "dependencies": { "@dbp-toolkit/common": "^0.2.2", - "@open-wc/scoped-elements": "^1.3.3", - "lit-element": "^2.4.0" + "@open-wc/scoped-elements": "^2.0.0", + "lit": "^2.0.0" }, "scripts": { "clean": "rm dist/*", diff --git a/packages/typescript-example/src/dbp-typescript-example-demo.ts b/packages/typescript-example/src/dbp-typescript-example-demo.ts index dc17a32c..24c96a73 100644 --- a/packages/typescript-example/src/dbp-typescript-example-demo.ts +++ b/packages/typescript-example/src/dbp-typescript-example-demo.ts @@ -1,4 +1,4 @@ -import {html, LitElement, TemplateResult} from 'lit-element'; +import {html, LitElement, TemplateResult} from 'lit'; import {TypeScriptExample} from './typescript-example'; import * as commonUtils from '@dbp-toolkit/common/utils'; import { ScopedElementsMixin, ScopedElementsMap } from '@open-wc/scoped-elements'; diff --git a/packages/typescript-example/src/typescript-example.ts b/packages/typescript-example/src/typescript-example.ts index a7c6503a..ed22bd66 100644 --- a/packages/typescript-example/src/typescript-example.ts +++ b/packages/typescript-example/src/typescript-example.ts @@ -1,4 +1,4 @@ -import {html,LitElement} from 'lit-element'; +import {html,LitElement} from 'lit'; import {createInstance} from './i18n'; export class TypeScriptExample extends LitElement { diff --git a/toolkit-showcase/package.json b/toolkit-showcase/package.json index 5d2cc94c..d8fbc6e0 100644 --- a/toolkit-showcase/package.json +++ b/toolkit-showcase/package.json @@ -49,11 +49,10 @@ "@dbp-toolkit/organization-select": "^0.2.0", "@dbp-toolkit/person-profile": "^0.2.0", "@dbp-toolkit/person-select": "^0.2.0", - "@open-wc/scoped-elements": "^1.3.3", + "@open-wc/scoped-elements": "^2.0.0", "@rollup/plugin-replace": "^3.0.0", "highlight.js": "^11.0.0", - "lit-element": "^2.4.0", - "lit-html": "^1.3.0" + "lit": "^2.0.0" }, "scripts": { "build": "rollup -c", diff --git a/toolkit-showcase/src/dbp-auth-demo-activity.js b/toolkit-showcase/src/dbp-auth-demo-activity.js index f0acf993..2c7f3ce6 100644 --- a/toolkit-showcase/src/dbp-auth-demo-activity.js +++ b/toolkit-showcase/src/dbp-auth-demo-activity.js @@ -1,9 +1,9 @@ -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {DbpAuthDemo} from '@dbp-toolkit/auth/src/dbp-auth-demo'; import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonStyles from '@dbp-toolkit/common/styles'; -import {unsafeHTML} from 'lit-html/directives/unsafe-html.js'; +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"; diff --git a/toolkit-showcase/src/dbp-check-in-place-select-demo-activity.js b/toolkit-showcase/src/dbp-check-in-place-select-demo-activity.js index bc446d4c..d098a750 100644 --- a/toolkit-showcase/src/dbp-check-in-place-select-demo-activity.js +++ b/toolkit-showcase/src/dbp-check-in-place-select-demo-activity.js @@ -1,9 +1,9 @@ -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {CheckInPlaceSelectDemo} from '@dbp-toolkit/check-in-place-select/src/dbp-check-in-place-select-demo'; import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonStyles from '@dbp-toolkit/common/styles'; -import {unsafeHTML} from 'lit-html/directives/unsafe-html.js'; +import {unsafeHTML} from 'lit/directives/unsafe-html.js'; import readme from '@dbp-toolkit/check-in-place-select/README.md'; import * as demoStyles from "./styles"; import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element"; diff --git a/toolkit-showcase/src/dbp-common-demo-activity.js b/toolkit-showcase/src/dbp-common-demo-activity.js index 2bbc4f36..9f9330a6 100644 --- a/toolkit-showcase/src/dbp-common-demo-activity.js +++ b/toolkit-showcase/src/dbp-common-demo-activity.js @@ -1,9 +1,9 @@ -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {DbpCommonDemo} from '@dbp-toolkit/common/dbp-common-demo'; import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonStyles from '@dbp-toolkit/common/styles'; -import {unsafeHTML} from 'lit-html/directives/unsafe-html.js'; +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"; 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 4ce20d8e..f54e36fd 100644 --- a/toolkit-showcase/src/dbp-data-table-view-demo-activity.js +++ b/toolkit-showcase/src/dbp-data-table-view-demo-activity.js @@ -1,9 +1,9 @@ -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {DataTableViewDemo} from '@dbp-toolkit/data-table-view/src/dbp-data-table-view-demo'; import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonStyles from '@dbp-toolkit/common/styles'; -import {unsafeHTML} from 'lit-html/directives/unsafe-html.js'; +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"; diff --git a/toolkit-showcase/src/dbp-demo-template.js b/toolkit-showcase/src/dbp-demo-template.js index 03b9583c..ee5e2e21 100644 --- a/toolkit-showcase/src/dbp-demo-template.js +++ b/toolkit-showcase/src/dbp-demo-template.js @@ -1,8 +1,8 @@ -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; //import {ClassName} from '@dbp-toolkit/package-name/src/dbp-demo-activity-name'; TODO import * as commonStyles from '@dbp-toolkit/common/styles'; -import {unsafeHTML} from 'lit-html/directives/unsafe-html.js'; +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"; diff --git a/toolkit-showcase/src/dbp-file-handling-demo-activity.js b/toolkit-showcase/src/dbp-file-handling-demo-activity.js index e1d5f68d..3d0b26f9 100644 --- a/toolkit-showcase/src/dbp-file-handling-demo-activity.js +++ b/toolkit-showcase/src/dbp-file-handling-demo-activity.js @@ -1,9 +1,9 @@ -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {FileSourceDemo} from '@dbp-toolkit/file-handling/src/demo'; import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonStyles from '@dbp-toolkit/common/styles'; -import {unsafeHTML} from 'lit-html/directives/unsafe-html.js'; +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"; 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 4d093a44..3ded518d 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 @@ -1,9 +1,9 @@ -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {KnowledgeBaseWebPageElementViewDemo} from '@dbp-toolkit/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo'; import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonStyles from '@dbp-toolkit/common/styles'; -import {unsafeHTML} from 'lit-html/directives/unsafe-html.js'; +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"; diff --git a/toolkit-showcase/src/dbp-language-select-demo-activity.js b/toolkit-showcase/src/dbp-language-select-demo-activity.js index baadec0f..509a2039 100644 --- a/toolkit-showcase/src/dbp-language-select-demo-activity.js +++ b/toolkit-showcase/src/dbp-language-select-demo-activity.js @@ -1,9 +1,9 @@ -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {LanguageSelectDemo} from '@dbp-toolkit/language-select/src/dbp-language-select-demo'; import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonStyles from '@dbp-toolkit/common/styles'; -import {unsafeHTML} from 'lit-html/directives/unsafe-html.js'; +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"; diff --git a/toolkit-showcase/src/dbp-matomo-demo-activity.js b/toolkit-showcase/src/dbp-matomo-demo-activity.js index 463f0a55..ec4aaeaa 100644 --- a/toolkit-showcase/src/dbp-matomo-demo-activity.js +++ b/toolkit-showcase/src/dbp-matomo-demo-activity.js @@ -1,9 +1,9 @@ -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {MatomoDemo} from '@dbp-toolkit/matomo/src/dbp-matomo-demo'; import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonStyles from '@dbp-toolkit/common/styles'; -import {unsafeHTML} from 'lit-html/directives/unsafe-html.js'; +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"; diff --git a/toolkit-showcase/src/dbp-notification-demo-activity.js b/toolkit-showcase/src/dbp-notification-demo-activity.js index d45432bf..0cbee683 100644 --- a/toolkit-showcase/src/dbp-notification-demo-activity.js +++ b/toolkit-showcase/src/dbp-notification-demo-activity.js @@ -1,9 +1,9 @@ -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {NotificationDemo} from '@dbp-toolkit/notification/src/dbp-notification-demo'; import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonStyles from '@dbp-toolkit/common/styles'; -import {unsafeHTML} from 'lit-html/directives/unsafe-html.js'; +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"; diff --git a/toolkit-showcase/src/dbp-organization-select-demo-activity.js b/toolkit-showcase/src/dbp-organization-select-demo-activity.js index a579c8e7..061664ab 100644 --- a/toolkit-showcase/src/dbp-organization-select-demo-activity.js +++ b/toolkit-showcase/src/dbp-organization-select-demo-activity.js @@ -1,9 +1,9 @@ -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {OrganizationSelectDemo} from '@dbp-toolkit/organization-select/src/dbp-organization-select-demo'; import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonStyles from '@dbp-toolkit/common/styles'; -import {unsafeHTML} from 'lit-html/directives/unsafe-html.js'; +import {unsafeHTML} from 'lit/directives/unsafe-html.js'; import readme from '@dbp-toolkit/organization-select/README.md'; import * as demoStyles from "./styles"; import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element"; diff --git a/toolkit-showcase/src/dbp-person-profile-demo-activity.js b/toolkit-showcase/src/dbp-person-profile-demo-activity.js index 3a83c9c3..8186f01a 100644 --- a/toolkit-showcase/src/dbp-person-profile-demo-activity.js +++ b/toolkit-showcase/src/dbp-person-profile-demo-activity.js @@ -1,9 +1,9 @@ -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {PersonProfileDemo} from '@dbp-toolkit/person-profile/src/dbp-person-profile-demo'; import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonStyles from '@dbp-toolkit/common/styles'; -import {unsafeHTML} from 'lit-html/directives/unsafe-html.js'; +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"; diff --git a/toolkit-showcase/src/dbp-person-select-demo-activity.js b/toolkit-showcase/src/dbp-person-select-demo-activity.js index 793ae3b3..742a1f3d 100644 --- a/toolkit-showcase/src/dbp-person-select-demo-activity.js +++ b/toolkit-showcase/src/dbp-person-select-demo-activity.js @@ -1,9 +1,9 @@ -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {PersonSelectDemo} from '@dbp-toolkit/person-select/src/dbp-person-select-demo'; import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonStyles from '@dbp-toolkit/common/styles'; -import {unsafeHTML} from 'lit-html/directives/unsafe-html.js'; +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"; 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 a0d908f2..9a9afcf1 100644 --- a/toolkit-showcase/src/dbp-qr-code-scanner-demo-activity.js +++ b/toolkit-showcase/src/dbp-qr-code-scanner-demo-activity.js @@ -1,9 +1,9 @@ -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {QrCodeScannerDemo} from '@dbp-toolkit/qr-code-scanner/src/dbp-qr-code-scanner-demo'; import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonStyles from '@dbp-toolkit/common/styles'; -import {unsafeHTML} from 'lit-html/directives/unsafe-html.js'; +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"; diff --git a/toolkit-showcase/src/dbp-tooltip-demo-activity.js b/toolkit-showcase/src/dbp-tooltip-demo-activity.js index 1ee16492..88d56187 100644 --- a/toolkit-showcase/src/dbp-tooltip-demo-activity.js +++ b/toolkit-showcase/src/dbp-tooltip-demo-activity.js @@ -1,9 +1,9 @@ -import {css, html} from 'lit-element'; +import {css, html} from 'lit'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {TooltipDemo} from '@dbp-toolkit/tooltip/src/dbp-tooltip-demo'; import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonStyles from '@dbp-toolkit/common/styles'; -import {unsafeHTML} from 'lit-html/directives/unsafe-html.js'; +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"; diff --git a/toolkit-showcase/src/styles.js b/toolkit-showcase/src/styles.js index 540afdde..226f1940 100644 --- a/toolkit-showcase/src/styles.js +++ b/toolkit-showcase/src/styles.js @@ -1,4 +1,4 @@ -import {css, CSSResult, unsafeCSS} from 'lit-element'; +import {css, CSSResult, unsafeCSS} from 'lit'; import * as commonUtils from '@dbp-toolkit/common/utils'; import highlightCSSPath from 'highlight.js/styles/github.css'; diff --git a/yarn.lock b/yarn.lock index d0bc1b7f..5c11235a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1629,6 +1629,11 @@ npmlog "^4.1.2" write-file-atomic "^3.0.3" +"@lit/reactive-element@^1.0.0": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@lit/reactive-element/-/reactive-element-1.0.2.tgz#daa7a7c7a6c63d735f0c9634de6b7dbd70a702ab" + integrity sha512-oz3d3MKjQ2tXynQgyaQaMpGTDNyNDeBdo6dXf1AbjTwhA1IRINHmA7kSaVYv9ttKweNkEoNqp9DqteDdgWzPEg== + "@mrmlnc/readdir-enhanced@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde" @@ -1839,13 +1844,14 @@ resolved "https://registry.yarnpkg.com/@open-wc/dedupe-mixin/-/dedupe-mixin-1.3.0.tgz#0df5d438285fc3482838786ee81895318f0ff778" integrity sha512-UfdK1MPnR6T7f3svzzYBfu3qBkkZ/KsPhcpc3JYhsUY4hbpwNF9wEQtD4Z+/mRqMTJrKg++YSxIxE0FBhY3RIw== -"@open-wc/scoped-elements@^1.3.3": - version "1.3.4" - resolved "https://registry.yarnpkg.com/@open-wc/scoped-elements/-/scoped-elements-1.3.4.tgz#96e27e13c8b09668ee631e9fccd5623a05af5cc2" - integrity sha512-WD+ObocdzcFCpBxnc8bQa7NoATeA+tJrK0/c/yV1Nx4leV+1PmJNNu+WCcuckBEGd0Op6FP8w1TidoqmVVba6g== +"@open-wc/scoped-elements@^2.0.0": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@open-wc/scoped-elements/-/scoped-elements-2.0.1.tgz#6b1c3535f809bd90710574db80093a81e3a1fc2d" + integrity sha512-JS6ozxUFwFX3+Er91v9yQzNIaFn7OnE0iESKTbFvkkKdNwvAPtp1fpckBKIvWk8Ae9ZcoI9DYZuT2DDbMPcadA== dependencies: + "@lit/reactive-element" "^1.0.0" "@open-wc/dedupe-mixin" "^1.3.0" - lit-html "^1.0.0" + "@webcomponents/scoped-custom-element-registry" "^0.0.3" "@popperjs/core@^2.9.0": version "2.10.2" @@ -2088,6 +2094,11 @@ resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.9.tgz#152c6c20a7688c30b967ec1841d31ace569863fc" integrity sha512-L/TMpyURfBkf+o/526Zb6kd/tchUP3iBDEPjqjb+U2MAJhVRxxrmr2fwpe08E7QsV7YLcpq0tUaQ9O9x97ZIxQ== +"@types/trusted-types@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.2.tgz#fc25ad9943bcac11cceb8168db4f275e0e72e756" + integrity sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg== + "@typescript-eslint/eslint-plugin@^5.0.0-alpha.42": version "5.4.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.4.0.tgz#05e711a2e7b68342661fde61bccbd1531c19521a" @@ -2163,6 +2174,11 @@ resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44" integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q== +"@webcomponents/scoped-custom-element-registry@^0.0.3": + version "0.0.3" + resolved "https://registry.yarnpkg.com/@webcomponents/scoped-custom-element-registry/-/scoped-custom-element-registry-0.0.3.tgz#774591a886b0b0e4914717273ba53fd8d5657522" + integrity sha512-lpSzgDCGbM99dytb3+J3Suo4+Bk1E13MPnWB42JK8GwxSAxFz+tC7TTv2hhDSIE2IirGNKNKCf3m08ecu6eAsQ== + "@yarn-tool/resolve-package@^1.0.36": version "1.0.37" resolved "https://registry.yarnpkg.com/@yarn-tool/resolve-package/-/resolve-package-1.0.37.tgz#9837ec2eba3a30e914600858c439de25baedacb7" @@ -5464,17 +5480,29 @@ lit-analyzer@1.2.1: vscode-html-languageservice "3.1.0" web-component-analyzer "~1.1.1" -lit-element@^2.1.0, lit-element@^2.4.0: - version "2.5.1" - resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-2.5.1.tgz#3fa74b121a6cd22902409ae3859b7847d01aa6b6" - integrity sha512-ogu7PiJTA33bEK0xGu1dmaX5vhcRjBXCFexPja0e7P7jqLhTpNKYRPmE+GmiCaRVAbiQKGkUgkh/i6+bh++dPQ== +lit-element@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-3.0.2.tgz#6422b68ba166a32695f524d6f3eb41712610bf50" + integrity sha512-9vTJ47D2DSE4Jwhle7aMzEwO2ZcOPRikqfT3CVG7Qol2c9/I4KZwinZNW5Xv8hNm+G/enSSfIwqQhIXi6ioAUg== dependencies: - lit-html "^1.1.1" + "@lit/reactive-element" "^1.0.0" + lit-html "^2.0.0" -lit-html@^1.0.0, lit-html@^1.1.1, lit-html@^1.3.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-1.4.1.tgz#0c6f3ee4ad4eb610a49831787f0478ad8e9ae5e0" - integrity sha512-B9btcSgPYb1q4oSOb/PrOT6Z/H+r6xuNzfH4lFli/AWhYwdtrgQkQWBbIc6mdnf6E2IL3gDXdkkqNktpU0OZQA== +lit-html@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-2.0.2.tgz#6a17caac4135757710c5fb3e4becc622c476e431" + integrity sha512-dON7Zg8btb14/fWohQLQBdSgkoiQA4mIUy87evmyJHtxRq7zS6LlC32bT5EPWiof5PUQaDpF45v2OlrxHA5Clg== + dependencies: + "@types/trusted-types" "^2.0.2" + +lit@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/lit/-/lit-2.0.2.tgz#5e6f422924e0732258629fb379556b6d23f7179c" + integrity sha512-hKA/1YaSB+P+DvKWuR2q1Xzy/iayhNrJ3aveD0OQ9CKn6wUjsdnF/7LavDOJsKP/K5jzW/kXsuduPgRvTFrFJw== + dependencies: + "@lit/reactive-element" "^1.0.0" + lit-element "^3.0.0" + lit-html "^2.0.0" load-json-file@^4.0.0: version "4.0.0" -- GitLab