From 048460b41cca0710aeaf5b79416190c8f900c632 Mon Sep 17 00:00:00 2001 From: basels Date: Mon, 12 Jul 2021 15:58:06 +0200 Subject: [PATCH] quick fix of previous commit --- callbacks/openidconnect-icons.js | 2 +- .../openidconnect-popup-signin-callback.js | 2 +- .../openidconnect-popup-signout-callback.js | 2 +- .../openidconnect-signin-silent-callback.js | 2 +- las2peer-frontend-statusbar.js | 2 +- package-lock.json | 58 ++++++++----------- package.json | 2 +- 7 files changed, 30 insertions(+), 40 deletions(-) diff --git a/callbacks/openidconnect-icons.js b/callbacks/openidconnect-icons.js index 67524d4..910f425 100644 --- a/callbacks/openidconnect-icons.js +++ b/callbacks/openidconnect-icons.js @@ -8,7 +8,7 @@ Code distributed by Google as part of the polymer project is also subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt */ -import { html } from '@polymer/lit-element'; +import { html } from 'lit-element'; export const openidconnectIcon = html``; export const signOutIcon = html``; diff --git a/callbacks/openidconnect-popup-signin-callback.js b/callbacks/openidconnect-popup-signin-callback.js index 9a688dd..c9fc162 100644 --- a/callbacks/openidconnect-popup-signin-callback.js +++ b/callbacks/openidconnect-popup-signin-callback.js @@ -4,7 +4,7 @@ Copyright (c) 2018 Advanced Community Information Systems (ACIS) Group, Chair of Information Systems), RWTH Aachen University, Germany. All rights reserved. */ -import {LitElement} from '@polymer/lit-element'; +import {LitElement} from 'lit-element'; import 'oidc-client'; diff --git a/callbacks/openidconnect-popup-signout-callback.js b/callbacks/openidconnect-popup-signout-callback.js index e32b0f2..220a9f5 100644 --- a/callbacks/openidconnect-popup-signout-callback.js +++ b/callbacks/openidconnect-popup-signout-callback.js @@ -4,7 +4,7 @@ Copyright (c) 2018 Advanced Community Information Systems (ACIS) Group, Chair of Information Systems), RWTH Aachen University, Germany. All rights reserved. */ -import {LitElement} from '@polymer/lit-element'; +import {LitElement} from 'lit-element'; import 'oidc-client'; diff --git a/callbacks/openidconnect-signin-silent-callback.js b/callbacks/openidconnect-signin-silent-callback.js index e79b638..48a0fa8 100644 --- a/callbacks/openidconnect-signin-silent-callback.js +++ b/callbacks/openidconnect-signin-silent-callback.js @@ -4,7 +4,7 @@ Copyright (c) 2018 Advanced Community Information Systems (ACIS) Group, Chair of Information Systems), RWTH Aachen University, Germany. All rights reserved. */ -import {LitElement} from '@polymer/lit-element'; +import {LitElement} from 'lit-element'; import 'oidc-client'; diff --git a/las2peer-frontend-statusbar.js b/las2peer-frontend-statusbar.js index b3c860f..a416451 100644 --- a/las2peer-frontend-statusbar.js +++ b/las2peer-frontend-statusbar.js @@ -1,4 +1,4 @@ -import {html, LitElement} from '@polymer/lit-element'; +import {html, LitElement} from 'lit-element'; import 'openidconnect-signin/openidconnect-signin.js'; import 'openidconnect-signin/openidconnect-popup-signin-callback.js'; import 'openidconnect-signin/openidconnect-popup-signout-callback.js'; diff --git a/package-lock.json b/package-lock.json index 120cb4d..4ec433b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -217,14 +217,6 @@ "@polymer/polymer": "^3.0.0" } }, - "@polymer/lit-element": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/@polymer/lit-element/-/lit-element-0.6.5.tgz", - "integrity": "sha512-KVjuU/5Ugp6PFob6YEe1/B4GCKjqhEy9Tj954shL6d3DohT2sNAmbX9QfbXvcZ8RhbVELK6dzbN3i2BRA3mOKg==", - "requires": { - "lit-html": "^1.0.0-rc.1" - } - }, "@polymer/neon-animation": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/@polymer/neon-animation/-/neon-animation-3.0.1.tgz", @@ -458,6 +450,11 @@ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" }, + "core-js": { + "version": "3.15.2", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.15.2.tgz", + "integrity": "sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q==" + }, "crypto-js": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.0.0.tgz", @@ -490,43 +487,36 @@ "@webcomponents/webcomponentsjs": "^2.2.1" } }, + "lit-element": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-2.5.1.tgz", + "integrity": "sha512-ogu7PiJTA33bEK0xGu1dmaX5vhcRjBXCFexPja0e7P7jqLhTpNKYRPmE+GmiCaRVAbiQKGkUgkh/i6+bh++dPQ==", + "requires": { + "lit-html": "^1.1.1" + } + }, "lit-html": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-1.3.0.tgz", "integrity": "sha512-0Q1bwmaFH9O14vycPHw8C/IeHMk/uSDldVLIefu/kfbTBGIc44KGH6A8p1bDfxUfHdc8q6Ct7kQklWoHgr4t1Q==" }, + "oidc-client": { + "version": "github:rwth-acis/oidc-client-js#d3205cf842a127bc645446a9aada46c9801a4709", + "from": "github:rwth-acis/oidc-client-js", + "requires": { + "acorn": "^7.4.1", + "base64-js": "^1.5.1", + "core-js": "^3.8.3", + "crypto-js": "^4.0.0", + "serialize-javascript": "^4.0.0" + } + }, "openidconnect-signin": { "version": "github:rwth-acis/openidconnect-signin#35c3810a25964c6b8792e2ee7c14b9cec3be5613", "from": "github:rwth-acis/openidconnect-signin", "requires": { "lit-element": "^2.5.1", "oidc-client": "github:rwth-acis/oidc-client-js" - }, - "dependencies": { - "core-js": { - "version": "3.15.2", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.15.2.tgz", - "integrity": "sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q==" - }, - "lit-element": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-2.5.1.tgz", - "integrity": "sha512-ogu7PiJTA33bEK0xGu1dmaX5vhcRjBXCFexPja0e7P7jqLhTpNKYRPmE+GmiCaRVAbiQKGkUgkh/i6+bh++dPQ==", - "requires": { - "lit-html": "^1.1.1" - } - }, - "oidc-client": { - "version": "github:rwth-acis/oidc-client-js#d3205cf842a127bc645446a9aada46c9801a4709", - "from": "github:rwth-acis/oidc-client-js", - "requires": { - "acorn": "^7.4.1", - "base64-js": "^1.5.1", - "core-js": "^3.8.3", - "crypto-js": "^4.0.0", - "serialize-javascript": "^4.0.0" - } - } } }, "randombytes": { diff --git a/package.json b/package.json index c00bf30..a982a3f 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "description": "A polymer widget which uses the las2peer Contact and UserInformation Service as well as the openId connect service", "main": "las2peer-frontend-statusbar.js", "dependencies": { - "@polymer/lit-element": "^0.6.3", "las2peer-frontend-user-widget": "github:rwth-acis/las2peer-frontend-user-widget#0.3.0", + "lit-element": "^2.5.1", "openidconnect-signin": "github:rwth-acis/openidconnect-signin" } }