From 44381de6a1812c14895d59055e8c043da1c8a667 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Mon, 19 Aug 2019 13:11:46 +0200
Subject: [PATCH] Use rollup-plugin-url for including css assets
This way we don't have to mirror the directory structure in packages
which vendor this package.
---
packages/person-select/assets/favicon.ico | Bin 2550 -> 0 bytes
packages/person-select/package.json | 13 +++++++------
packages/person-select/rollup.config.js | 15 +++++++++------
packages/person-select/src/person-select.js | 4 +++-
4 files changed, 19 insertions(+), 13 deletions(-)
delete mode 100644 packages/person-select/assets/favicon.ico
diff --git a/packages/person-select/assets/favicon.ico b/packages/person-select/assets/favicon.ico
deleted file mode 100644
index f6cf22d1afc22f071d2b64c7779bc5214c3adae5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2550
zcmeH{J!@1^5Qg9Qfi}@C1S=tFL@SHw1R=k|!X_wkl3I{dku4;hA_M{lL{exWVu~Os
z1S^fr9!$4EB!X-a459`s0v5+-W+QHv-9Sty-ek_b^WOP*?wq?<8qpCo8sdCX)5oRr
z(yl+I>0{D;v<t3bW0=SJF)<RS?$UEzYelP?S6lT<(cAVnwKq5Q;OTQ@<6gotRwQ?g
z#n24RTqEB@5_;kyp(pf&?r9l4qi39qp3ym}pcnLlUJwd;#jp6aMA=G1qqtGXNHRDb
z$zU)T3<iV2U<f1_3<iV2U@#a069$99U@#aAhCqkGU@#aA27|$9U~m{5796$vctMi5
z&RD_F{gGiwG*2{26iu+i7`U0ZNU$VWVk~eZI1(HQjs!=H3XTLrf+4}+qf2lk7!nM{
zpPMyCNT2Q>evH?r0~Nh9Q88+IXP7cgGYv9KnckV3nIf6qnclG-(Houqnf{snzD1e-
znb~9*G7Opb#J7#9#M7g2X7z1k28DhFwgN|?Uu>;&FoOa|aSk3Vwwt5^OM#^TQD_*i
z04#;XLQp{{u<(yjhdn8<6rV@1_}k#SfCfW_p~6sMs4!F*;&p<dz))eRFccUlgAory
zg`vVwVW2dI4nu{Z!cYOI^e+^vBvyhFH4=V;qeg9yNgCG^O-@c~W@binb8}i)SWv6g
z((>}M*4Njyv9X~}r=zW{Ep2aaYiDOi-+xv;UR+eO*<`x@8}JkL!t=WBRy}G@sd4mn
z*v(Pt!_taYX0PkU*(t3qz1IAzdA*#yrz<B$_5Rc|T|0M2FK(UD)yp6C?%`L>uKv*H
zOH*2FtjRhnYF&IoheIDnIC_ih_1%j@zADy!zenswML;)xxAGnbt>5njILLK(wlVIQ
z^CxEQ)*SEJUA~iU_4KaAUi^vQ`<)$&))Rb#{~!BJpnvN7#SXgnxB2~fgM9DTum5J~
r*9Z9r$sZIutmdHDLE3)#9zX2p&l?suOh0V?u)6<--anm#erJ9GA@oeM
diff --git a/packages/person-select/package.json b/packages/person-select/package.json
index 711c4e8b..f15702e5 100644
--- a/packages/person-select/package.json
+++ b/packages/person-select/package.json
@@ -3,24 +3,25 @@
"version": "1.0.0",
"main": "src/index.js",
"devDependencies": {
+ "chai": "^4.2.0",
+ "i18next-scanner": "^2.10.2",
"karma": "^4.2.0",
"karma-chai": "^0.1.0",
"karma-chrome-launcher": "^3.1.0",
"karma-mocha": "^1.3.0",
+ "mocha": "^6.2.0",
"node-sass": "^4.12.0",
"puppeteer": "^1.15.0",
- "mocha": "^6.2.0",
- "chai": "^4.2.0",
"rollup": "^1.11.3",
"rollup-plugin-commonjs": "^10.0.2",
"rollup-plugin-copy": "^3.1.0",
+ "rollup-plugin-json": "^4.0.0",
+ "rollup-plugin-multi-entry": "^2.1.0",
"rollup-plugin-node-resolve": "^5.2.0",
+ "rollup-plugin-replace": "^2.2.0",
"rollup-plugin-serve": "^1.0.1",
"rollup-plugin-terser": "^5.1.1",
- "rollup-plugin-json": "^4.0.0",
- "rollup-plugin-replace": "^2.2.0",
- "rollup-plugin-multi-entry": "^2.1.0",
- "i18next-scanner": "^2.10.2",
+ "rollup-plugin-url": "^2.2.2",
"vpu-auth": "file:./vendor/auth",
"vpu-common": "file:./vendor/common"
},
diff --git a/packages/person-select/rollup.config.js b/packages/person-select/rollup.config.js
index cf179bb3..8ac39115 100644
--- a/packages/person-select/rollup.config.js
+++ b/packages/person-select/rollup.config.js
@@ -7,6 +7,7 @@ import json from 'rollup-plugin-json';
import replace from "rollup-plugin-replace";
import serve from 'rollup-plugin-serve';
import multiEntry from 'rollup-plugin-multi-entry';
+import url from "rollup-plugin-url"
const pkg = require('./package.json');
const build = (typeof process.env.BUILD !== 'undefined') ? process.env.BUILD : 'local';
@@ -29,6 +30,14 @@ export default {
commonjs({
include: 'node_modules/**'
}),
+ url({
+ limit: 0,
+ include: [
+ "node_modules/select2/**/*.css",
+ ],
+ emitFiles: true,
+ fileName: 'shared/[name].[hash][extname]'
+ }),
json(),
replace({
"process.env.BUILD": '"' + build + '"',
@@ -37,12 +46,6 @@ export default {
copy({
targets: [
{src: 'assets/index.html', dest: 'dist'},
- {src: 'assets/favicon.ico', dest: 'dist'},
- ],
- }),
- copy({
- targets: [
- {src: 'node_modules/select2/dist/css', dest: 'dist/select2'},
],
}),
(process.env.ROLLUP_WATCH === 'true') ? serve({contentBase: 'dist', host: '127.0.0.1', port: 8002}) : false
diff --git a/packages/person-select/src/person-select.js b/packages/person-select/src/person-select.js
index 8d773334..868fcbf1 100644
--- a/packages/person-select/src/person-select.js
+++ b/packages/person-select/src/person-select.js
@@ -8,6 +8,8 @@ import {html} from 'lit-element';
import {i18n} from './i18n.js';
import VPULitElementJQuery from 'vpu-common/vpu-lit-element-jquery';
import commonUtils from 'vpu-common/utils';
+import select2CSSPath from 'select2/dist/css/select2.min.css';
+
select2(window, $);
@@ -160,7 +162,7 @@ class PersonSelect extends VPULitElementJQuery {
}
render() {
- const select2CSS = getAssetURL('select2/css/select2.min.css');
+ const select2CSS = getAssetURL(select2CSSPath);
return html`
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.7.5/css/bulma.min.css">
--
GitLab