From 6c933973893ff07bd754d67dfb69c7a3b6619ea7 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Wed, 16 Jun 2021 15:20:08 +0200
Subject: [PATCH] Port to lit2

---
 package.json                              |  5 +-
 src/dbp-official-signature-pdf-upload.js  |  4 +-
 src/dbp-pdf-annotation-view.js            |  4 +-
 src/dbp-pdf-preview.js                    |  6 +--
 src/dbp-qualified-signature-pdf-upload.js |  4 +-
 src/dbp-signature-verification-full.js    |  4 +-
 src/dbp-signature-verification.js         |  2 +-
 src/ext-sign-iframe.js                    |  2 +-
 src/textswitch.js                         |  2 +-
 vendor/toolkit                            |  2 +-
 yarn.lock                                 | 64 ++++++++++++++---------
 11 files changed, 57 insertions(+), 42 deletions(-)

diff --git a/package.json b/package.json
index 7018f8d..9d9b273 100644
--- a/package.json
+++ b/package.json
@@ -52,13 +52,12 @@
     "@dbp-toolkit/person-profile": "^0.2.0",
     "@dbp-toolkit/organization-select": "^0.2.0",
     "@digital-blueprint/annotpdf": "^1.0.13-a",
-    "@open-wc/scoped-elements": "^1.3.3",
+    "@open-wc/scoped-elements": "^2.0.0-next.2",
     "fabric": "^4.2.0",
     "file-saver": "^2.0.2",
     "i18next": "^20.0.0",
     "jszip": "^3.5.0",
-    "lit-element": "^2.3.1",
-    "lit-html": "^1.2.1",
+    "lit": "^2.0.0-rc.1",
     "pdfjs-dist": "2.8.335",
     "universal-router": "^9.0.1"
   },
diff --git a/src/dbp-official-signature-pdf-upload.js b/src/dbp-official-signature-pdf-upload.js
index 2180f60..e36be0a 100644
--- a/src/dbp-official-signature-pdf-upload.js
+++ b/src/dbp-official-signature-pdf-upload.js
@@ -1,6 +1,6 @@
 import {createI18nInstance} from './i18n.js';
 import {humanFileSize} from '@dbp-toolkit/common/i18next.js';
-import {css, html} from 'lit-element';
+import {css, html} from 'lit';
 import {ScopedElementsMixin} from '@open-wc/scoped-elements';
 import DBPSignatureLitElement from "./dbp-signature-lit-element";
 import {PdfPreview} from "./dbp-pdf-preview";
@@ -8,7 +8,7 @@ import * as commonUtils from '@dbp-toolkit/common/utils';
 import * as utils from './utils';
 import {Button, Icon, MiniSpinner} from '@dbp-toolkit/common';
 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 {FileSource} from '@dbp-toolkit/file-handling';
 import JSONLD from "@dbp-toolkit/common/jsonld";
 import {TextSwitch} from './textswitch.js';
diff --git a/src/dbp-pdf-annotation-view.js b/src/dbp-pdf-annotation-view.js
index 3805d8e..675c101 100644
--- a/src/dbp-pdf-annotation-view.js
+++ b/src/dbp-pdf-annotation-view.js
@@ -1,6 +1,6 @@
 import {createI18nInstance} from './i18n.js';
-import {css, html} from 'lit-element';
-import {classMap} from 'lit-html/directives/class-map.js';
+import {css, html} from 'lit';
+import {classMap} from 'lit/directives/class-map.js';
 import {ScopedElementsMixin} from '@open-wc/scoped-elements';
 import DBPLitElement from '@dbp-toolkit/common/dbp-lit-element';
 import {MiniSpinner, Icon} from '@dbp-toolkit/common';
diff --git a/src/dbp-pdf-preview.js b/src/dbp-pdf-preview.js
index 17395c1..0357378 100644
--- a/src/dbp-pdf-preview.js
+++ b/src/dbp-pdf-preview.js
@@ -1,7 +1,7 @@
 import {createI18nInstance} from './i18n.js';
-import {css, html} from 'lit-element';
-import {classMap} from 'lit-html/directives/class-map.js';
-import {live} from 'lit-html/directives/live.js';
+import {css, html} from 'lit';
+import {classMap} from 'lit/directives/class-map.js';
+import {live} from 'lit/directives/live.js';
 import {ScopedElementsMixin} from '@open-wc/scoped-elements';
 import DBPLitElement from '@dbp-toolkit/common/dbp-lit-element';
 import {MiniSpinner, Icon} from '@dbp-toolkit/common';
diff --git a/src/dbp-qualified-signature-pdf-upload.js b/src/dbp-qualified-signature-pdf-upload.js
index a3548b6..7a03522 100644
--- a/src/dbp-qualified-signature-pdf-upload.js
+++ b/src/dbp-qualified-signature-pdf-upload.js
@@ -1,6 +1,6 @@
 import {createI18nInstance} from './i18n.js';
 import {humanFileSize} from '@dbp-toolkit/common/i18next.js';
-import {css, html} from 'lit-element';
+import {css, html} from 'lit';
 import {ScopedElementsMixin} from '@open-wc/scoped-elements';
 import DBPSignatureLitElement from "./dbp-signature-lit-element";
 import {PdfPreview} from "./dbp-pdf-preview";
@@ -8,7 +8,7 @@ import * as commonUtils from '@dbp-toolkit/common/utils';
 import * as utils from './utils';
 import {Button, Icon, MiniSpinner} from '@dbp-toolkit/common';
 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 {FileSource} from '@dbp-toolkit/file-handling';
 import JSONLD from "@dbp-toolkit/common/jsonld";
 import {TextSwitch} from './textswitch.js';
diff --git a/src/dbp-signature-verification-full.js b/src/dbp-signature-verification-full.js
index ed0b909..d8a6d5b 100644
--- a/src/dbp-signature-verification-full.js
+++ b/src/dbp-signature-verification-full.js
@@ -1,13 +1,13 @@
 import {createI18nInstance} from './i18n.js';
 import {humanFileSize} from '@dbp-toolkit/common/i18next.js';
-import {css, html} from 'lit-element';
+import {css, html} from 'lit';
 import {ScopedElementsMixin} from '@open-wc/scoped-elements';
 import DBPSignatureLitElement from "./dbp-signature-lit-element";
 import {PdfPreview} from "./dbp-pdf-preview";
 import * as commonUtils from '@dbp-toolkit/common/utils';
 import {Icon, MiniSpinner, Button} from '@dbp-toolkit/common';
 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 {FileSource} from '@dbp-toolkit/file-handling';
 import JSONLD from "@dbp-toolkit/common/jsonld";
 import {name as pkgName} from './../package.json';
diff --git a/src/dbp-signature-verification.js b/src/dbp-signature-verification.js
index fd1dbb2..818bfe6 100644
--- a/src/dbp-signature-verification.js
+++ b/src/dbp-signature-verification.js
@@ -1,5 +1,5 @@
 import {createI18nInstance} from './i18n.js';
-import {css, html} from 'lit-element';
+import {css, html} from 'lit';
 import {ScopedElementsMixin} from '@open-wc/scoped-elements';
 import DBPSignatureLitElement from "./dbp-signature-lit-element";
 import * as commonUtils from '@dbp-toolkit/common/utils';
diff --git a/src/ext-sign-iframe.js b/src/ext-sign-iframe.js
index 62b5e61..3c04963 100644
--- a/src/ext-sign-iframe.js
+++ b/src/ext-sign-iframe.js
@@ -1,5 +1,5 @@
 import {LitElement, html, css} from "lit-element";
-import {classMap} from 'lit-html/directives/class-map.js';
+import {classMap} from 'lit/directives/class-map.js';
 import {MiniSpinner} from '@dbp-toolkit/common';
 import {ScopedElementsMixin} from '@open-wc/scoped-elements';
 
diff --git a/src/textswitch.js b/src/textswitch.js
index 667e912..475a277 100644
--- a/src/textswitch.js
+++ b/src/textswitch.js
@@ -1,4 +1,4 @@
-import {html, LitElement, css} from 'lit-element';
+import {html, LitElement, css} from 'lit';
 import * as commonStyles from '@dbp-toolkit/common/styles';
 
 const BUTTON1 = "button1";
diff --git a/vendor/toolkit b/vendor/toolkit
index ae6193f..1afee37 160000
--- a/vendor/toolkit
+++ b/vendor/toolkit
@@ -1 +1 @@
-Subproject commit ae6193fddbced85d0bbf620e4ab7d4aa4dfbd748
+Subproject commit 1afee376925a3826cc06bbe56d4b1077231f7e44
diff --git a/yarn.lock b/yarn.lock
index c4006f4..0a008f4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1042,6 +1042,11 @@
   dependencies:
     "@types/chai" "^4.2.12"
 
+"@lit/reactive-element@^1.0.0-rc.1", "@lit/reactive-element@^1.0.0-rc.2":
+  version "1.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@lit/reactive-element/-/reactive-element-1.0.0-rc.2.tgz#f24dba16ea571a08dca70f1783bd2ca5ec8de3ee"
+  integrity sha512-cujeIl5Ei8FC7UHf4/4Q3bRJOtdTe1vpJV/JEBYCggedmQ+2P8A2oz7eE+Vxi6OJ4nc0X+KZxXnBoH4QrEbmEQ==
+
 "@mapbox/node-pre-gyp@^1.0.0":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.5.tgz#2a0b32fcb416fb3f2250fd24cb2a81421a4f5950"
@@ -1096,13 +1101,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.3"
-  resolved "https://registry.npmjs.org/@open-wc/scoped-elements/-/scoped-elements-1.3.3.tgz#fe008aef4d74fb00c553c900602960638fc1c7b0"
-  integrity sha512-vFIQVYYjFw67odUE4JzZOpctnF7S/2DX+S+clrL3bQPql7HvEnV0wMFwOWUavQTuCJi0rfU8GTcNMiUybio+Yg==
+"@open-wc/scoped-elements@^2.0.0-next.2":
+  version "2.0.0-next.4"
+  resolved "https://registry.yarnpkg.com/@open-wc/scoped-elements/-/scoped-elements-2.0.0-next.4.tgz#d8294358e3e8ad2ba44200ab805549fde49245f6"
+  integrity sha512-BMd5n5BHLi3FBhwhPbBuN7pZdi8I1CIQn10aKLZtg9aplVhN2BG1rwr0ANebXJ6fdq8m1PE1wQAaCXYCcEBTEQ==
   dependencies:
+    "@lit/reactive-element" "^1.0.0-rc.1"
     "@open-wc/dedupe-mixin" "^1.3.0"
-    lit-html "^1.0.0"
+    "@webcomponents/scoped-custom-element-registry" "0.0.2"
 
 "@rollup/plugin-babel@^5.0.4":
   version "5.3.0"
@@ -1332,6 +1338,11 @@
   dependencies:
     "@types/node" "*"
 
+"@types/trusted-types@^1.0.1":
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-1.0.6.tgz#569b8a08121d3203398290d602d84d73c8dcf5da"
+  integrity sha512-230RC8sFeHoT6sSUlRO6a8cAnclO06eeiq1QDfiv2FGCLWFvvERWgwIQD4FWqD9A69BN7Lzee4OXwoMVnnsWDw==
+
 "@typescript-eslint/eslint-plugin@^4.22.0":
   version "4.22.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.22.0.tgz#3d5f29bb59e61a9dba1513d491b059e536e16dbc"
@@ -1407,6 +1418,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.2":
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/@webcomponents/scoped-custom-element-registry/-/scoped-custom-element-registry-0.0.2.tgz#c863d163cb39c60063808e5ae23e06a1766fbe5f"
+  integrity sha512-lKCoZfKoE3FHvmmj2ytaLBB8Grxp4HaxfSzaGlIZN6xXnOILfpCO0PFJkAxanefLGJWMho4kRY5PhgxWFhmSOw==
+
 abab@^2.0.0:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
@@ -4237,29 +4253,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.4.0"
-  resolved "https://registry.npmjs.org/lit-element/-/lit-element-2.4.0.tgz#b22607a037a8fc08f5a80736dddf7f3f5d401452"
-  integrity sha512-pBGLglxyhq/Prk2H91nA0KByq/hx/wssJBQFiYqXhGDvEnY31PRGYf1RglVzyLeRysu0IHm2K0P196uLLWmwFg==
+lit-element@^3.0.0-rc.2:
+  version "3.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-3.0.0-rc.2.tgz#883d0b6fd7b846226d360699d1b713da5fc7e1b7"
+  integrity sha512-2Z7DabJ3b5K+p5073vFjMODoaWqy5PIaI4y6ADKm+fCGc8OnX9fU9dMoUEBZjFpd/bEFR9PBp050tUtBnT9XTQ==
   dependencies:
-    lit-html "^1.1.1"
+    "@lit/reactive-element" "^1.0.0-rc.2"
+    lit-html "^2.0.0-rc.3"
 
-lit-element@^2.3.1:
-  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-html@^2.0.0-rc.3:
+  version "2.0.0-rc.3"
+  resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-2.0.0-rc.3.tgz#1c216e548630e18d3093d97f4e29563abce659af"
+  integrity sha512-Y6P8LlAyQuqvzq6l/Nc4z5/P5M/rVLYKQIRxcNwSuGajK0g4kbcBFQqZmgvqKG+ak+dHZjfm2HUw9TF5N/pkCw==
   dependencies:
-    lit-html "^1.1.1"
-
-lit-html@^1.0.0, lit-html@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-1.3.0.tgz#c80f3cc5793a6dea6c07172be90a70ab20e56034"
-  integrity sha512-0Q1bwmaFH9O14vycPHw8C/IeHMk/uSDldVLIefu/kfbTBGIc44KGH6A8p1bDfxUfHdc8q6Ct7kQklWoHgr4t1Q==
+    "@types/trusted-types" "^1.0.1"
 
-lit-html@^1.1.1, lit-html@^1.2.1:
-  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@^2.0.0-rc.1:
+  version "2.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/lit/-/lit-2.0.0-rc.2.tgz#724a2d621aa098001d73bf7106f3a72b7b5948ef"
+  integrity sha512-BOCuoJR04WaTV8UqTKk09cNcQA10Aq2LCcBOiHuF7TzWH5RNDsbCBP5QM9sLBSotGTXbDug/gFO08jq6TbyEtw==
+  dependencies:
+    "@lit/reactive-element" "^1.0.0-rc.2"
+    lit-element "^3.0.0-rc.2"
+    lit-html "^2.0.0-rc.3"
 
 locate-path@^5.0.0:
   version "5.0.0"
-- 
GitLab