From 208089d8b70a48fab2a45d0603899a30c71db537 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Mon, 6 Jul 2020 10:55:35 +0200
Subject: [PATCH] knowledge-base-web-page-element-view: integrate into lerna
---
.../package.json | 4 ++--
.../rollup.config.js | 12 ++----------
.../src/knowledge-base-web-page-element-view.js | 9 ++++++---
.../knowledge-base-web-page-element-view/vendor/auth | 1 -
.../vendor/common | 1 -
5 files changed, 10 insertions(+), 17 deletions(-)
delete mode 160000 packages/knowledge-base-web-page-element-view/vendor/auth
delete mode 160000 packages/knowledge-base-web-page-element-view/vendor/common
diff --git a/packages/knowledge-base-web-page-element-view/package.json b/packages/knowledge-base-web-page-element-view/package.json
index 231d1a3d..c82c3851 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 24f6bff2..ba858b00 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 9fb9e6c6..b07f0887 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 39d0e356..00000000
--- 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 63b49c3a..00000000
--- a/packages/knowledge-base-web-page-element-view/vendor/common
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 63b49c3a2eeae312b4a2aeec4cc2f7f0ee12b749
--
GitLab