From 146171f671e3307a7a706b9bef7ad7c307787ca0 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Thu, 2 Jul 2020 15:01:49 +0200
Subject: [PATCH] person-select: integrate into lerna
---
packages/person-select/package.json | 4 ++--
packages/person-select/rollup.config.js | 12 ++----------
packages/person-select/src/person-select.js | 18 +++++++++---------
.../src/vpu-person-select-demo.js | 11 ++++++-----
4 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/packages/person-select/package.json b/packages/person-select/package.json
index d5aba552..c2543968 100644
--- a/packages/person-select/package.json
+++ b/packages/person-select/package.json
@@ -24,8 +24,8 @@
"@rollup/plugin-node-resolve": "^8.1.0",
"@rollup/plugin-replace": "^2.3.3",
"@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/person-select/rollup.config.js b/packages/person-select/rollup.config.js
index 51435f75..d74079e8 100644
--- a/packages/person-select/rollup.config.js
+++ b/packages/person-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';
@@ -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(),
url({
limit: 0,
include: [
diff --git a/packages/person-select/src/person-select.js b/packages/person-select/src/person-select.js
index 80fe7f7e..c2a74dec 100644
--- a/packages/person-select/src/person-select.js
+++ b/packages/person-select/src/person-select.js
@@ -301,14 +301,13 @@ export class PersonSelect extends ScopedElementsMixin(LitElement) {
}
static get styles() {
- // language=css
- return css`
- ${commonStyles.getThemeCSS()}
- ${commonStyles.getGeneralCSS()}
- ${commonStyles.getButtonCSS()}
- ${commonStyles.getFormAddonsCSS()}
- ${commonStyles.getSelect2CSS()}
-
+ return [
+ commonStyles.getThemeCSS(),
+ commonStyles.getGeneralCSS(),
+ commonStyles.getButtonCSS(),
+ commonStyles.getFormAddonsCSS(),
+ commonStyles.getSelect2CSS(),
+ css`
.select2-control.control {
width: 100%;
}
@@ -326,7 +325,8 @@ export class PersonSelect extends ScopedElementsMixin(LitElement) {
.field .button.control vpu-icon {
top: 0;
}
- `;
+ `
+ ];
}
render() {
diff --git a/packages/person-select/src/vpu-person-select-demo.js b/packages/person-select/src/vpu-person-select-demo.js
index 71087ba3..76878791 100644
--- a/packages/person-select/src/vpu-person-select-demo.js
+++ b/packages/person-select/src/vpu-person-select-demo.js
@@ -38,13 +38,14 @@ class PersonSelectDemo extends ScopedElementsMixin(LitElement) {
static get styles() {
// language=css
- return css`
- ${commonStyles.getThemeCSS()}
- ${commonStyles.getGeneralCSS()}
-
+ return [
+ commonStyles.getThemeCSS(),
+ commonStyles.getGeneralCSS(),
+ css`
h1.title {margin-bottom: 1em;}
div.container {margin-bottom: 1.5em;}
- `;
+ `
+ ];
}
getAuthComponentHtml() {
--
GitLab