From d1d9741f51d2c55c989228a8ae2a0c51acad8942 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Tue, 21 Apr 2020 11:09:38 +0200
Subject: [PATCH] Move the remaining web components to scoped elements
---
assets/vpu-signature.html.ejs | 7 +++++--
rollup.config.js | 2 +-
src/vpu-official-signature-pdf-upload.js | 7 +++----
src/vpu-qualified-signature-pdf-upload.js | 7 +++----
vendor/app-shell | 2 +-
vendor/auth | 2 +-
vendor/common | 2 +-
vendor/file-upload | 2 +-
vendor/language-select | 2 +-
vendor/notification | 2 +-
vendor/person-profile | 2 +-
11 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/assets/vpu-signature.html.ejs b/assets/vpu-signature.html.ejs
index 8aa6949..46575a7 100644
--- a/assets/vpu-signature.html.ejs
+++ b/assets/vpu-signature.html.ejs
@@ -19,7 +19,10 @@
<link rel="manifest" href="<%= geturl('vpu-signature.manifest.json') %>">
<!-- Loading spinner -->
- <script type="module" src="<%= geturl('local/vpu-signature/spinner.js') %>"></script>
+ <script type="module">
+ import {Spinner} from '<%= geturl('local/vpu-signature/spinner.js') %>';
+ customElements.define('vpu-loading-spinner', Spinner);
+ </script>
<!-- App bundles-->
<script type="module" id="vpu-app-src" src="<%= geturl('vpu-signature.js') %>"></script>
@@ -126,7 +129,7 @@
</head>
<body>
-<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>
+<vpu-app-signature lang="de" src="<%= geturl('vpu-signature.topic.metadata.json') %>" entry-point-url="<%= entryPointURL %>" base-path="<%= geturl('') %>"><vpu-loading-spinner></vpu-loading-spinner></vpu-app-signature>
<!-- Error handling for too old browsers -->
<script src="<%= geturl('local/vpu-signature/browser-check.js') %>" defer></script>
diff --git a/rollup.config.js b/rollup.config.js
index 519c0dc..036ab9c 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -237,7 +237,7 @@ export default {
{src: 'assets/*.ico', dest: 'dist/local/' + pkg.name},
{src: 'assets/*.svg', dest: 'dist/local/' + pkg.name},
{src: 'node_modules/source-sans-pro/WOFF2/OTF/*', dest: 'dist/local/' + pkg.name + '/fonts'},
- {src: 'node_modules/vpu-common/vpu-spinner.js', dest: 'dist/local/' + pkg.name, rename: 'spinner.js'},
+ {src: 'node_modules/vpu-common/src/spinner.js', dest: 'dist/local/' + pkg.name, rename: 'spinner.js'},
{src: 'assets/browser-check.js', dest: 'dist/local/' + pkg.name},
{src: 'assets/icon-*.png', dest: 'dist/local/' + pkg.name},
{src: 'assets/manifest.json', dest: 'dist', rename: pkg.name + '.manifest.json'},
diff --git a/src/vpu-official-signature-pdf-upload.js b/src/vpu-official-signature-pdf-upload.js
index c4a0897..eda731a 100644
--- a/src/vpu-official-signature-pdf-upload.js
+++ b/src/vpu-official-signature-pdf-upload.js
@@ -4,7 +4,7 @@ import {css, html} from 'lit-element';
import {ScopedElementsMixin} from '@open-wc/scoped-elements';
import VPUSignatureLitElement from "./vpu-signature-lit-element";
import * as commonUtils from 'vpu-common/utils';
-import {Icon} from 'vpu-common';
+import {Icon, MiniSpinner, Button} from 'vpu-common';
import * as utils from './utils';
import JSZip from 'jszip/dist/jszip.js';
import 'file-saver';
@@ -33,9 +33,8 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitElem
return {
'vpu-icon': Icon,
'vpu-fileupload': FileUpload,
- // FIXME: move them to explicit exports
- 'vpu-mini-spinner': customElements.get('vpu-mini-spinner'),
- 'vpu-button': customElements.get('vpu-button'),
+ 'vpu-mini-spinner': MiniSpinner,
+ 'vpu-button': Button,
};
}
diff --git a/src/vpu-qualified-signature-pdf-upload.js b/src/vpu-qualified-signature-pdf-upload.js
index e2bc097..00c769e 100644
--- a/src/vpu-qualified-signature-pdf-upload.js
+++ b/src/vpu-qualified-signature-pdf-upload.js
@@ -5,7 +5,7 @@ import {ScopedElementsMixin} from '@open-wc/scoped-elements';
import VPUSignatureLitElement from "./vpu-signature-lit-element";
import * as commonUtils from 'vpu-common/utils';
import * as utils from './utils';
-import {Icon} from 'vpu-common';
+import {Icon, MiniSpinner, Button} from 'vpu-common';
import JSZip from 'jszip/dist/jszip.js';
import 'file-saver';
import * as commonStyles from 'vpu-common/styles';
@@ -35,9 +35,8 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
return {
'vpu-icon': Icon,
'vpu-fileupload': FileUpload,
- // FIXME: move them to explicit exports
- 'vpu-mini-spinner': customElements.get('vpu-mini-spinner'),
- 'vpu-button': customElements.get('vpu-button'),
+ 'vpu-mini-spinner': MiniSpinner,
+ 'vpu-button': Button,
};
}
diff --git a/vendor/app-shell b/vendor/app-shell
index 6279a58..ce1f65f 160000
--- a/vendor/app-shell
+++ b/vendor/app-shell
@@ -1 +1 @@
-Subproject commit 6279a585c904cf59118b99d2e022cfc500c95de7
+Subproject commit ce1f65f15e5cf1c22836118e097e7c0558e41ebf
diff --git a/vendor/auth b/vendor/auth
index fbf8352..b9fbe48 160000
--- a/vendor/auth
+++ b/vendor/auth
@@ -1 +1 @@
-Subproject commit fbf83528159f7d3eeceedff287831dece6b9b46d
+Subproject commit b9fbe487a8a6117ae90a423a8ba318a0321bf51b
diff --git a/vendor/common b/vendor/common
index 010b54f..821137e 160000
--- a/vendor/common
+++ b/vendor/common
@@ -1 +1 @@
-Subproject commit 010b54fa455829d732152b6794c7a92a874249aa
+Subproject commit 821137e246fdcee9ccb04e4cfe420e7abec3186e
diff --git a/vendor/file-upload b/vendor/file-upload
index 3e3d72e..802daba 160000
--- a/vendor/file-upload
+++ b/vendor/file-upload
@@ -1 +1 @@
-Subproject commit 3e3d72eac23816f90f2cfa276e2c8b5a260f2448
+Subproject commit 802daba04ae496a4fb87c23b797522ffa894546a
diff --git a/vendor/language-select b/vendor/language-select
index 05266ff..7cddfd6 160000
--- a/vendor/language-select
+++ b/vendor/language-select
@@ -1 +1 @@
-Subproject commit 05266ff50d60b31743904ca3988afa9647455a1f
+Subproject commit 7cddfd69bc3343f02d6403f93e4bf5d567bdbc47
diff --git a/vendor/notification b/vendor/notification
index c7fe709..9a7b68e 160000
--- a/vendor/notification
+++ b/vendor/notification
@@ -1 +1 @@
-Subproject commit c7fe70928a4414a0943d5e5ca4e38e851faad270
+Subproject commit 9a7b68e12c1c9d28c248bfa102be8773f06a7c58
diff --git a/vendor/person-profile b/vendor/person-profile
index f80439b..8158d84 160000
--- a/vendor/person-profile
+++ b/vendor/person-profile
@@ -1 +1 @@
-Subproject commit f80439be64128e8f804ec8e3cf35065c1ed454f9
+Subproject commit 8158d8451e08bfaf495ee263d208a448df83e12d
--
GitLab