From 20c608dbb3eaa2763ce74dd34d43343d663a2a8b Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Mon, 20 Apr 2020 13:41:51 +0200
Subject: [PATCH] Update app-shell to use the scoped variant
---
assets/vpu-signature.html.ejs | 2 +-
package-lock.json | 29 ++++++++++++++++++++++++++++-
src/vpu-signature.js | 5 ++++-
vendor/app-shell | 2 +-
vendor/language-select | 2 +-
5 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/assets/vpu-signature.html.ejs b/assets/vpu-signature.html.ejs
index a7ce783..8aa6949 100644
--- a/assets/vpu-signature.html.ejs
+++ b/assets/vpu-signature.html.ejs
@@ -126,7 +126,7 @@
</head>
<body>
-<vpu-app-shell lang="de" src="<%= geturl('vpu-signature.topic.metadata.json') %>" entry-point-url="<%= entryPointURL %>" base-path="<%= geturl('') %>"><vpu-spinner></vpu-spinner></vpu-app-shell>
+<vpu-app-signature lang="de" src="<%= geturl('vpu-signature.topic.metadata.json') %>" entry-point-url="<%= entryPointURL %>" base-path="<%= geturl('') %>"><vpu-spinner></vpu-spinner></vpu-app-signature>
<!-- Error handling for too old browsers -->
<script src="<%= geturl('local/vpu-signature/browser-check.js') %>" defer></script>
diff --git a/package-lock.json b/package-lock.json
index 172c40c..e2b320d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -488,6 +488,20 @@
"fastq": "^1.6.0"
}
},
+ "@open-wc/dedupe-mixin": {
+ "version": "1.2.16",
+ "resolved": "https://registry.npmjs.org/@open-wc/dedupe-mixin/-/dedupe-mixin-1.2.16.tgz",
+ "integrity": "sha512-7FMRmUyxAmNqFN0Vm5/yLIwxkD3UO97r10ymZc/nz9YyPksfHk0CxjCM4upDBzte5F6qyomhMW5POCr1c7/6vw=="
+ },
+ "@open-wc/scoped-elements": {
+ "version": "1.0.8",
+ "resolved": "https://registry.npmjs.org/@open-wc/scoped-elements/-/scoped-elements-1.0.8.tgz",
+ "integrity": "sha512-eM6MPG0kArvFdbRUTaOFR9/oUIn6O0GxlGy/T22PSB7flaDWKm6eJtn/Xn6zpWc9a6n84sOq9CWv8Y817NiTRA==",
+ "requires": {
+ "@open-wc/dedupe-mixin": "^1.2.16",
+ "lit-html": "^1.0.0"
+ }
+ },
"@rollup/plugin-commonjs": {
"version": "11.1.0",
"resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-11.1.0.tgz",
@@ -1221,6 +1235,7 @@
"requires": {
"anymatch": "~3.1.1",
"braces": "~3.0.2",
+ "fsevents": "~2.1.2",
"glob-parent": "~5.1.0",
"is-binary-path": "~2.1.0",
"is-glob": "~4.0.1",
@@ -2314,6 +2329,13 @@
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
"dev": true
},
+ "fsevents": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz",
+ "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==",
+ "dev": true,
+ "optional": true
+ },
"function-bind": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -3541,6 +3563,7 @@
"requires": {
"anymatch": "~3.1.1",
"braces": "~3.0.2",
+ "fsevents": "~2.1.1",
"glob-parent": "~5.1.0",
"is-binary-path": "~2.1.0",
"is-glob": "~4.0.1",
@@ -4354,7 +4377,10 @@
"version": "2.6.1",
"resolved": "https://registry.npmjs.org/rollup/-/rollup-2.6.1.tgz",
"integrity": "sha512-1RhFDRJeg027YjBO6+JxmVWkEZY0ASztHhoEUEWxOwkh4mjO58TFD6Uo7T7Y3FbmDpRTfKhM5NVxJyimCn0Elg==",
- "dev": true
+ "dev": true,
+ "requires": {
+ "fsevents": "~2.1.2"
+ }
},
"rollup-plugin-babel": {
"version": "5.0.0-alpha.2",
@@ -5459,6 +5485,7 @@
"vpu-language-select": {
"version": "file:vendor/language-select",
"requires": {
+ "@open-wc/scoped-elements": "^1.0.8",
"lit-element": "^2.2.1"
}
},
diff --git a/src/vpu-signature.js b/src/vpu-signature.js
index b463f4b..c9a1eda 100644
--- a/src/vpu-signature.js
+++ b/src/vpu-signature.js
@@ -1 +1,4 @@
-import 'vpu-app-shell';
+import {AppShell} from 'vpu-app-shell';
+import * as commonUtils from 'vpu-common/utils';
+
+commonUtils.defineCustomElement('vpu-app-signature', AppShell);
\ No newline at end of file
diff --git a/vendor/app-shell b/vendor/app-shell
index c869443..bcdb25b 160000
--- a/vendor/app-shell
+++ b/vendor/app-shell
@@ -1 +1 @@
-Subproject commit c869443381c0e01ccfc920b2558ec85c02f9e83d
+Subproject commit bcdb25b836c1bf95e052fb4c504b44a7742b566b
diff --git a/vendor/language-select b/vendor/language-select
index 9a3c905..f679727 160000
--- a/vendor/language-select
+++ b/vendor/language-select
@@ -1 +1 @@
-Subproject commit 9a3c9052ed1809b302d2738e6aa3da7e4d29b819
+Subproject commit f6797279a5f00dfe4db52e44f1e016aedeec6a6d
--
GitLab