diff --git a/packages/knowledge-base-web-page-element-view/package.json b/packages/knowledge-base-web-page-element-view/package.json index 231d1a3d0a7d245964d9d9e955432917e32e8797..c82c3851199ad7cc4e0d2f1550808a36c97a84fd 100644 --- a/packages/knowledge-base-web-page-element-view/package.json +++ b/packages/knowledge-base-web-page-element-view/package.json @@ -24,8 +24,8 @@ "rollup-plugin-serve": "^1.0.1", "rollup-plugin-terser": "^6.1.0", "@rollup/plugin-url": "^5.0.1", - "vpu-auth": "file:./vendor/auth", - "vpu-common": "file:./vendor/common" + "vpu-auth": "^1.0.0", + "vpu-common": "^1.0.0" }, "dependencies": { "@open-wc/scoped-elements": "^1.0.9", diff --git a/packages/knowledge-base-web-page-element-view/rollup.config.js b/packages/knowledge-base-web-page-element-view/rollup.config.js index 24f6bff21f59e3c85f5e2b0073e67f9052f7e175..ba858b00bcb3bbda6e6f08aad30279e41841449d 100644 --- a/packages/knowledge-base-web-page-element-view/rollup.config.js +++ b/packages/knowledge-base-web-page-element-view/rollup.config.js @@ -1,5 +1,4 @@ import glob from 'glob'; -import path from 'path'; import resolve from '@rollup/plugin-node-resolve'; import commonjs from '@rollup/plugin-commonjs'; import copy from 'rollup-plugin-copy'; @@ -36,15 +35,8 @@ export default { consts({ environment: build, }), - resolve({ - customResolveOptions: { - // ignore node_modules from vendored packages - moduleDirectory: path.join(process.cwd(), 'node_modules') - } - }), - commonjs({ - include: 'node_modules/**' - }), + resolve(), + commonjs(), json(), url({ limit: 0, 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 9fb9e6c61ac43100ded43267676b4aebae335a17..b07f0887f7c6e8f22edc3c9f2669a8e24d442bf0 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,6 +1,5 @@ import {i18n} from './i18n'; -import {html} from 'lit-element'; -import VPULitElement from 'vpu-common/vpu-lit-element' +import {html, LitElement} from 'lit-element'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {MiniSpinner} from 'vpu-common'; import * as commonUtils from "vpu-common/utils"; @@ -9,7 +8,7 @@ import {unsafeHTML} from 'lit-html/directives/unsafe-html.js'; /** * KnowledgeBaseWebPageElementView web component */ -export class KnowledgeBaseWebPageElementView extends ScopedElementsMixin(VPULitElement) { +export class KnowledgeBaseWebPageElementView extends ScopedElementsMixin(LitElement) { constructor() { super(); this.lang = 'de'; @@ -30,6 +29,10 @@ export class KnowledgeBaseWebPageElementView extends ScopedElementsMixin(VPULitE }; } + _(selector) { + return this.shadowRoot === null ? this.querySelector(selector) : this.shadowRoot.querySelector(selector); + } + /** * See: https://lit-element.polymer-project.org/guide/properties#initialize */ diff --git a/packages/knowledge-base-web-page-element-view/vendor/auth b/packages/knowledge-base-web-page-element-view/vendor/auth deleted file mode 160000 index 39d0e356c029e0f2e92233520660ce307d0741d5..0000000000000000000000000000000000000000 --- a/packages/knowledge-base-web-page-element-view/vendor/auth +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 39d0e356c029e0f2e92233520660ce307d0741d5 diff --git a/packages/knowledge-base-web-page-element-view/vendor/common b/packages/knowledge-base-web-page-element-view/vendor/common deleted file mode 160000 index 63b49c3a2eeae312b4a2aeec4cc2f7f0ee12b749..0000000000000000000000000000000000000000 --- a/packages/knowledge-base-web-page-element-view/vendor/common +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 63b49c3a2eeae312b4a2aeec4cc2f7f0ee12b749