From ba4cb4beaa43766aa7aadabe718a0a49e9603c39 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Thu, 2 Jul 2020 16:03:16 +0200
Subject: [PATCH] language-select: integrate into lerna

---
 packages/language-select/package.json           |  2 +-
 packages/language-select/rollup.config.js       | 12 ++----------
 packages/language-select/src/language-select.js |  8 ++++----
 packages/language-select/vendor/common          |  1 -
 4 files changed, 7 insertions(+), 16 deletions(-)
 delete mode 160000 packages/language-select/vendor/common

diff --git a/packages/language-select/package.json b/packages/language-select/package.json
index 0262aec9..90772964 100644
--- a/packages/language-select/package.json
+++ b/packages/language-select/package.json
@@ -22,7 +22,7 @@
     "rollup-plugin-terser": "^6.1.0",
     "rollup-plugin-delete": "^2.0.0",
     "i18next-scanner": "^2.10.2",
-    "vpu-common": "file:./vendor/common"
+    "vpu-common": "^1.0.0"
   },
   "dependencies": {
     "@open-wc/scoped-elements": "^1.0.8",
diff --git a/packages/language-select/rollup.config.js b/packages/language-select/rollup.config.js
index 4eca7627..90e6dc56 100644
--- a/packages/language-select/rollup.config.js
+++ b/packages/language-select/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';
@@ -28,15 +27,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(),
         (build !== 'local' && build !== 'test') ? terser() : false,
         copy({
diff --git a/packages/language-select/src/language-select.js b/packages/language-select/src/language-select.js
index 27cd64e1..f3464ea1 100644
--- a/packages/language-select/src/language-select.js
+++ b/packages/language-select/src/language-select.js
@@ -81,9 +81,8 @@ export class LanguageSelect extends LitElement {
 
     static get styles() {
         // language=css
-        return css`
-            ${commonStyles.getThemeCSS()}
-
+        return [commonStyles.getThemeCSS(),
+            css`
             :host {
                 display: inline-block;
             }
@@ -102,7 +101,8 @@ export class LanguageSelect extends LitElement {
                 color: var(--vpu-dark);
                 border-radius: var(--vpu-border-radius);
             }
-        `;
+            `
+        ];
     }
 
     onExternalChange(e) {
diff --git a/packages/language-select/vendor/common b/packages/language-select/vendor/common
deleted file mode 160000
index 63b49c3a..00000000
--- a/packages/language-select/vendor/common
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 63b49c3a2eeae312b4a2aeec4cc2f7f0ee12b749
-- 
GitLab