diff --git a/packages/person-select/package.json b/packages/person-select/package.json index d5aba552753e06d12d9dc512befbc92e18f048f6..c2543968b2491b86093b1fa0df88cd3bc9f88994 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 51435f75d5657a8b32e77861829705418e66e4c1..d74079e8ae2f9af2a71e6981d25f47e6175f9be7 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 80fe7f7e166295482be0a1b81228fe6323038542..c2a74decf60d0899ca0480c7a96e815611df065d 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 71087ba3c78abfdf2182c35899095d32be8108f1..76878791534f0e5455f9103cc6e4567fcefc5da8 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() {