Skip to content

Commit c15a085

Browse files
TFyreTFyre
authoredSep 12, 2022
Bump Vaadin to 23.2.0 & Project to 2.0.0-beta14 (#141)
* Vaadin 23.2.0 Release version 2.0.0-beta14 * Fix onecolor & ShadyCSS
·
v24.0.2v23.0.0
1 parent 0de9672 commit c15a085

File tree

5 files changed

+364
-63
lines changed

5 files changed

+364
-63
lines changed
 

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ package-lock.json
88
package.json
99
webpack.config.ts
1010
webpack.generated.js
11+
vite.generated.ts
1112
/src/test/resources/apexcharts.d.ts
1213

1314
# eclipse

‎package.json

+337-45
Original file line numberDiff line numberDiff line change
@@ -2,66 +2,358 @@
22
"name": "no-name",
33
"license": "UNLICENSED",
44
"dependencies": {
5+
"@polymer/iron-icon": "3.0.1",
6+
"@polymer/iron-iconset-svg": "3.0.1",
7+
"@polymer/iron-list": "3.1.0",
8+
"@polymer/iron-meta": "3.0.1",
9+
"@polymer/iron-resizable-behavior": "3.0.1",
10+
"@polymer/polymer": "3.5.1",
11+
"@vaadin/accordion": "23.2.0",
12+
"@vaadin/app-layout": "23.2.0",
13+
"@vaadin/avatar": "23.2.0",
14+
"@vaadin/avatar-group": "23.2.0",
15+
"@vaadin/bundles": "23.2.0",
16+
"@vaadin/button": "23.2.0",
17+
"@vaadin/checkbox": "23.2.0",
18+
"@vaadin/checkbox-group": "23.2.0",
19+
"@vaadin/combo-box": "23.2.0",
520
"@vaadin/common-frontend": "0.0.17",
6-
"construct-style-sheets-polyfill": "3.1.0",
7-
"lit": "2.2.3",
21+
"@vaadin/component-base": "23.2.0",
22+
"@vaadin/confirm-dialog": "23.2.0",
23+
"@vaadin/context-menu": "23.2.0",
24+
"@vaadin/custom-field": "23.2.0",
25+
"@vaadin/date-picker": "23.2.0",
26+
"@vaadin/date-time-picker": "23.2.0",
27+
"@vaadin/details": "23.2.0",
28+
"@vaadin/dialog": "23.2.0",
29+
"@vaadin/email-field": "23.2.0",
30+
"@vaadin/field-base": "23.2.0",
31+
"@vaadin/field-highlighter": "23.2.0",
32+
"@vaadin/flow-frontend": "./target/flow-frontend",
33+
"@vaadin/form-layout": "23.2.0",
34+
"@vaadin/grid": "23.2.0",
35+
"@vaadin/horizontal-layout": "23.2.0",
36+
"@vaadin/icon": "23.2.0",
37+
"@vaadin/icons": "23.2.0",
38+
"@vaadin/input-container": "23.2.0",
39+
"@vaadin/integer-field": "23.2.0",
40+
"@vaadin/item": "23.2.0",
41+
"@vaadin/list-box": "23.2.0",
42+
"@vaadin/lit-renderer": "23.2.0",
43+
"@vaadin/login": "23.2.0",
44+
"@vaadin/menu-bar": "23.2.0",
45+
"@vaadin/message-input": "23.2.0",
46+
"@vaadin/message-list": "23.2.0",
47+
"@vaadin/multi-select-combo-box": "23.2.0",
48+
"@vaadin/notification": "23.2.0",
49+
"@vaadin/number-field": "23.2.0",
50+
"@vaadin/password-field": "23.2.0",
51+
"@vaadin/polymer-legacy-adapter": "23.2.0",
52+
"@vaadin/progress-bar": "23.2.0",
53+
"@vaadin/radio-group": "23.2.0",
854
"@vaadin/router": "1.7.4",
9-
"@polymer/polymer": "3.4.1"
55+
"@vaadin/scroller": "23.2.0",
56+
"@vaadin/select": "23.2.0",
57+
"@vaadin/split-layout": "23.2.0",
58+
"@vaadin/tabs": "23.2.0",
59+
"@vaadin/text-area": "23.2.0",
60+
"@vaadin/text-field": "23.2.0",
61+
"@vaadin/time-picker": "23.2.0",
62+
"@vaadin/upload": "23.2.0",
63+
"@vaadin/vaadin-accordion": "23.2.0",
64+
"@vaadin/vaadin-app-layout": "23.2.0",
65+
"@vaadin/vaadin-avatar": "23.2.0",
66+
"@vaadin/vaadin-button": "23.2.0",
67+
"@vaadin/vaadin-checkbox": "23.2.0",
68+
"@vaadin/vaadin-combo-box": "23.2.0",
69+
"@vaadin/vaadin-confirm-dialog": "23.2.0",
70+
"@vaadin/vaadin-context-menu": "23.2.0",
71+
"@vaadin/vaadin-custom-field": "23.2.0",
72+
"@vaadin/vaadin-date-picker": "23.2.0",
73+
"@vaadin/vaadin-date-time-picker": "23.2.0",
74+
"@vaadin/vaadin-details": "23.2.0",
75+
"@vaadin/vaadin-development-mode-detector": "2.0.5",
76+
"@vaadin/vaadin-dialog": "23.2.0",
77+
"@vaadin/vaadin-form-layout": "23.2.0",
78+
"@vaadin/vaadin-grid": "23.2.0",
79+
"@vaadin/vaadin-icon": "23.2.0",
80+
"@vaadin/vaadin-icons": "23.2.0",
81+
"@vaadin/vaadin-item": "23.2.0",
82+
"@vaadin/vaadin-list-box": "23.2.0",
83+
"@vaadin/vaadin-list-mixin": "23.2.0",
84+
"@vaadin/vaadin-login": "23.2.0",
85+
"@vaadin/vaadin-lumo-styles": "23.2.0",
86+
"@vaadin/vaadin-material-styles": "23.2.0",
87+
"@vaadin/vaadin-menu-bar": "23.2.0",
88+
"@vaadin/vaadin-messages": "23.2.0",
89+
"@vaadin/vaadin-notification": "23.2.0",
90+
"@vaadin/vaadin-ordered-layout": "23.2.0",
91+
"@vaadin/vaadin-overlay": "23.2.0",
92+
"@vaadin/vaadin-progress-bar": "23.2.0",
93+
"@vaadin/vaadin-radio-button": "23.2.0",
94+
"@vaadin/vaadin-select": "23.2.0",
95+
"@vaadin/vaadin-split-layout": "23.2.0",
96+
"@vaadin/vaadin-tabs": "23.2.0",
97+
"@vaadin/vaadin-template-renderer": "23.2.0",
98+
"@vaadin/vaadin-text-field": "23.2.0",
99+
"@vaadin/vaadin-themable-mixin": "23.2.0",
100+
"@vaadin/vaadin-time-picker": "23.2.0",
101+
"@vaadin/vaadin-upload": "23.2.0",
102+
"@vaadin/vaadin-usage-statistics": "2.1.2",
103+
"@vaadin/vaadin-virtual-list": "23.2.0",
104+
"@vaadin/vertical-layout": "23.2.0",
105+
"@vaadin/virtual-list": "23.2.0",
106+
"apexcharts": "3.30.0",
107+
"construct-style-sheets-polyfill": "3.1.0",
108+
"date-fns": "2.28.0",
109+
"lit": "2.3.0",
110+
"onecolor": "3.1.0"
10111
},
11112
"devDependencies": {
12-
"compression-webpack-plugin": "4.0.1",
13-
"esbuild-loader": "2.19.0",
14-
"webpack-cli": "4.10.0",
15-
"css-loader": "5.2.7",
16-
"file-loader": "6.2.0",
17-
"fork-ts-checker-webpack-plugin": "6.2.1",
18-
"extra-watch-webpack-plugin": "1.0.3",
19-
"glob": "7.1.6",
20-
"lit-css-loader": "0.1.0",
21-
"loader-utils": "2.0.0",
113+
"@rollup/plugin-replace": "3.1.0",
114+
"@rollup/pluginutils": "4.1.0",
22115
"async": "3.2.2",
116+
"glob": "7.2.3",
117+
"mkdirp": "1.0.4",
118+
"rollup-plugin-brotli": "3.1.0",
119+
"transform-ast": "2.4.4",
120+
"typescript": "4.7.4",
121+
"vite": "v3.0.9",
122+
"vite-plugin-checker": "0.4.9",
123+
"workbox-build": "6.5.0",
23124
"workbox-core": "6.5.0",
24-
"webpack": "4.46.0",
25-
"html-webpack-plugin": "4.5.1",
26-
"chokidar": "^3.5.0",
27-
"workbox-precaching": "6.5.0",
28-
"typescript": "4.5.3",
29-
"webpack-merge": "4.2.2",
30-
"webpack-dev-server": "4.9.2",
31-
"extract-loader": "5.1.0",
32-
"workbox-webpack-plugin": "6.5.0"
125+
"workbox-precaching": "6.5.0"
33126
},
34127
"vaadin": {
35128
"dependencies": {
129+
"@polymer/iron-icon": "3.0.1",
130+
"@polymer/iron-iconset-svg": "3.0.1",
131+
"@polymer/iron-list": "3.1.0",
132+
"@polymer/iron-meta": "3.0.1",
133+
"@polymer/iron-resizable-behavior": "3.0.1",
134+
"@polymer/polymer": "3.5.1",
135+
"@vaadin/accordion": "23.2.0",
136+
"@vaadin/app-layout": "23.2.0",
137+
"@vaadin/avatar": "23.2.0",
138+
"@vaadin/avatar-group": "23.2.0",
139+
"@vaadin/bundles": "23.2.0",
140+
"@vaadin/button": "23.2.0",
141+
"@vaadin/checkbox": "23.2.0",
142+
"@vaadin/checkbox-group": "23.2.0",
143+
"@vaadin/combo-box": "23.2.0",
36144
"@vaadin/common-frontend": "0.0.17",
37-
"construct-style-sheets-polyfill": "3.1.0",
38-
"lit": "2.2.3",
145+
"@vaadin/component-base": "23.2.0",
146+
"@vaadin/confirm-dialog": "23.2.0",
147+
"@vaadin/context-menu": "23.2.0",
148+
"@vaadin/custom-field": "23.2.0",
149+
"@vaadin/date-picker": "23.2.0",
150+
"@vaadin/date-time-picker": "23.2.0",
151+
"@vaadin/details": "23.2.0",
152+
"@vaadin/dialog": "23.2.0",
153+
"@vaadin/email-field": "23.2.0",
154+
"@vaadin/field-base": "23.2.0",
155+
"@vaadin/field-highlighter": "23.2.0",
156+
"@vaadin/form-layout": "23.2.0",
157+
"@vaadin/grid": "23.2.0",
158+
"@vaadin/horizontal-layout": "23.2.0",
159+
"@vaadin/icon": "23.2.0",
160+
"@vaadin/icons": "23.2.0",
161+
"@vaadin/input-container": "23.2.0",
162+
"@vaadin/integer-field": "23.2.0",
163+
"@vaadin/item": "23.2.0",
164+
"@vaadin/list-box": "23.2.0",
165+
"@vaadin/lit-renderer": "23.2.0",
166+
"@vaadin/login": "23.2.0",
167+
"@vaadin/menu-bar": "23.2.0",
168+
"@vaadin/message-input": "23.2.0",
169+
"@vaadin/message-list": "23.2.0",
170+
"@vaadin/multi-select-combo-box": "23.2.0",
171+
"@vaadin/notification": "23.2.0",
172+
"@vaadin/number-field": "23.2.0",
173+
"@vaadin/password-field": "23.2.0",
174+
"@vaadin/polymer-legacy-adapter": "23.2.0",
175+
"@vaadin/progress-bar": "23.2.0",
176+
"@vaadin/radio-group": "23.2.0",
39177
"@vaadin/router": "1.7.4",
40-
"@polymer/polymer": "3.4.1"
178+
"@vaadin/scroller": "23.2.0",
179+
"@vaadin/select": "23.2.0",
180+
"@vaadin/split-layout": "23.2.0",
181+
"@vaadin/tabs": "23.2.0",
182+
"@vaadin/text-area": "23.2.0",
183+
"@vaadin/text-field": "23.2.0",
184+
"@vaadin/time-picker": "23.2.0",
185+
"@vaadin/upload": "23.2.0",
186+
"@vaadin/vaadin-accordion": "23.2.0",
187+
"@vaadin/vaadin-app-layout": "23.2.0",
188+
"@vaadin/vaadin-avatar": "23.2.0",
189+
"@vaadin/vaadin-button": "23.2.0",
190+
"@vaadin/vaadin-checkbox": "23.2.0",
191+
"@vaadin/vaadin-combo-box": "23.2.0",
192+
"@vaadin/vaadin-confirm-dialog": "23.2.0",
193+
"@vaadin/vaadin-context-menu": "23.2.0",
194+
"@vaadin/vaadin-custom-field": "23.2.0",
195+
"@vaadin/vaadin-date-picker": "23.2.0",
196+
"@vaadin/vaadin-date-time-picker": "23.2.0",
197+
"@vaadin/vaadin-details": "23.2.0",
198+
"@vaadin/vaadin-development-mode-detector": "2.0.5",
199+
"@vaadin/vaadin-dialog": "23.2.0",
200+
"@vaadin/vaadin-form-layout": "23.2.0",
201+
"@vaadin/vaadin-grid": "23.2.0",
202+
"@vaadin/vaadin-icon": "23.2.0",
203+
"@vaadin/vaadin-icons": "23.2.0",
204+
"@vaadin/vaadin-item": "23.2.0",
205+
"@vaadin/vaadin-list-box": "23.2.0",
206+
"@vaadin/vaadin-list-mixin": "23.2.0",
207+
"@vaadin/vaadin-login": "23.2.0",
208+
"@vaadin/vaadin-lumo-styles": "23.2.0",
209+
"@vaadin/vaadin-material-styles": "23.2.0",
210+
"@vaadin/vaadin-menu-bar": "23.2.0",
211+
"@vaadin/vaadin-messages": "23.2.0",
212+
"@vaadin/vaadin-notification": "23.2.0",
213+
"@vaadin/vaadin-ordered-layout": "23.2.0",
214+
"@vaadin/vaadin-overlay": "23.2.0",
215+
"@vaadin/vaadin-progress-bar": "23.2.0",
216+
"@vaadin/vaadin-radio-button": "23.2.0",
217+
"@vaadin/vaadin-select": "23.2.0",
218+
"@vaadin/vaadin-split-layout": "23.2.0",
219+
"@vaadin/vaadin-tabs": "23.2.0",
220+
"@vaadin/vaadin-template-renderer": "23.2.0",
221+
"@vaadin/vaadin-text-field": "23.2.0",
222+
"@vaadin/vaadin-themable-mixin": "23.2.0",
223+
"@vaadin/vaadin-time-picker": "23.2.0",
224+
"@vaadin/vaadin-upload": "23.2.0",
225+
"@vaadin/vaadin-usage-statistics": "2.1.2",
226+
"@vaadin/vaadin-virtual-list": "23.2.0",
227+
"@vaadin/vertical-layout": "23.2.0",
228+
"@vaadin/virtual-list": "23.2.0",
229+
"apexcharts": "3.30.0",
230+
"construct-style-sheets-polyfill": "3.1.0",
231+
"date-fns": "2.28.0",
232+
"lit": "2.3.0",
233+
"onecolor": "3.1.0"
41234
},
42235
"devDependencies": {
43-
"compression-webpack-plugin": "4.0.1",
44-
"esbuild-loader": "2.19.0",
45-
"webpack-cli": "4.10.0",
46-
"css-loader": "5.2.7",
47-
"file-loader": "6.2.0",
48-
"fork-ts-checker-webpack-plugin": "6.2.1",
49-
"extra-watch-webpack-plugin": "1.0.3",
50-
"glob": "7.1.6",
51-
"lit-css-loader": "0.1.0",
52-
"loader-utils": "2.0.0",
236+
"@rollup/plugin-replace": "3.1.0",
237+
"@rollup/pluginutils": "4.1.0",
53238
"async": "3.2.2",
239+
"glob": "7.2.3",
240+
"mkdirp": "1.0.4",
241+
"rollup-plugin-brotli": "3.1.0",
242+
"transform-ast": "2.4.4",
243+
"typescript": "4.7.4",
244+
"vite": "v3.0.9",
245+
"vite-plugin-checker": "0.4.9",
246+
"workbox-build": "6.5.0",
54247
"workbox-core": "6.5.0",
55-
"webpack": "4.46.0",
56-
"html-webpack-plugin": "4.5.1",
57-
"chokidar": "^3.5.0",
58-
"workbox-precaching": "6.5.0",
59-
"typescript": "4.5.3",
60-
"webpack-merge": "4.2.2",
61-
"webpack-dev-server": "4.9.2",
62-
"extract-loader": "5.1.0",
63-
"workbox-webpack-plugin": "6.5.0"
248+
"workbox-precaching": "6.5.0"
64249
},
65-
"hash": ""
250+
"hash": "4eb4f926721e790404b6f47eef798ba26ab913f5bbc9776f54e3f3f803a1fb82"
251+
},
252+
"overrides": {
253+
"@vaadin/bundles": "$@vaadin/bundles",
254+
"@vaadin/accordion": "$@vaadin/accordion",
255+
"@vaadin/app-layout": "$@vaadin/app-layout",
256+
"@vaadin/avatar": "$@vaadin/avatar",
257+
"@vaadin/avatar-group": "$@vaadin/avatar-group",
258+
"@vaadin/button": "$@vaadin/button",
259+
"@vaadin/checkbox": "$@vaadin/checkbox",
260+
"@vaadin/checkbox-group": "$@vaadin/checkbox-group",
261+
"@vaadin/combo-box": "$@vaadin/combo-box",
262+
"@vaadin/component-base": "$@vaadin/component-base",
263+
"@vaadin/confirm-dialog": "$@vaadin/confirm-dialog",
264+
"@vaadin/context-menu": "$@vaadin/context-menu",
265+
"@vaadin/custom-field": "$@vaadin/custom-field",
266+
"@vaadin/date-picker": "$@vaadin/date-picker",
267+
"@vaadin/date-time-picker": "$@vaadin/date-time-picker",
268+
"@vaadin/details": "$@vaadin/details",
269+
"@vaadin/dialog": "$@vaadin/dialog",
270+
"@vaadin/email-field": "$@vaadin/email-field",
271+
"@vaadin/field-base": "$@vaadin/field-base",
272+
"@vaadin/field-highlighter": "$@vaadin/field-highlighter",
273+
"@vaadin/form-layout": "$@vaadin/form-layout",
274+
"@vaadin/grid": "$@vaadin/grid",
275+
"@vaadin/horizontal-layout": "$@vaadin/horizontal-layout",
276+
"@vaadin/icon": "$@vaadin/icon",
277+
"@vaadin/icons": "$@vaadin/icons",
278+
"@vaadin/input-container": "$@vaadin/input-container",
279+
"@vaadin/integer-field": "$@vaadin/integer-field",
280+
"@polymer/iron-icon": "$@polymer/iron-icon",
281+
"@polymer/iron-iconset-svg": "$@polymer/iron-iconset-svg",
282+
"@polymer/iron-list": "$@polymer/iron-list",
283+
"@polymer/iron-meta": "$@polymer/iron-meta",
284+
"@polymer/iron-resizable-behavior": "$@polymer/iron-resizable-behavior",
285+
"@vaadin/item": "$@vaadin/item",
286+
"@vaadin/list-box": "$@vaadin/list-box",
287+
"@vaadin/lit-renderer": "$@vaadin/lit-renderer",
288+
"@vaadin/login": "$@vaadin/login",
289+
"@vaadin/menu-bar": "$@vaadin/menu-bar",
290+
"@vaadin/message-input": "$@vaadin/message-input",
291+
"@vaadin/message-list": "$@vaadin/message-list",
292+
"@vaadin/multi-select-combo-box": "$@vaadin/multi-select-combo-box",
293+
"@vaadin/notification": "$@vaadin/notification",
294+
"@vaadin/number-field": "$@vaadin/number-field",
295+
"@vaadin/password-field": "$@vaadin/password-field",
296+
"@vaadin/polymer-legacy-adapter": "$@vaadin/polymer-legacy-adapter",
297+
"@vaadin/progress-bar": "$@vaadin/progress-bar",
298+
"@vaadin/radio-group": "$@vaadin/radio-group",
299+
"@vaadin/scroller": "$@vaadin/scroller",
300+
"@vaadin/select": "$@vaadin/select",
301+
"@vaadin/split-layout": "$@vaadin/split-layout",
302+
"@vaadin/tabs": "$@vaadin/tabs",
303+
"@vaadin/text-area": "$@vaadin/text-area",
304+
"@vaadin/text-field": "$@vaadin/text-field",
305+
"@vaadin/time-picker": "$@vaadin/time-picker",
306+
"@vaadin/upload": "$@vaadin/upload",
307+
"@vaadin/vaadin-accordion": "$@vaadin/vaadin-accordion",
308+
"@vaadin/vaadin-app-layout": "$@vaadin/vaadin-app-layout",
309+
"@vaadin/vaadin-avatar": "$@vaadin/vaadin-avatar",
310+
"@vaadin/vaadin-button": "$@vaadin/vaadin-button",
311+
"@vaadin/vaadin-checkbox": "$@vaadin/vaadin-checkbox",
312+
"@vaadin/vaadin-combo-box": "$@vaadin/vaadin-combo-box",
313+
"@vaadin/vaadin-confirm-dialog": "$@vaadin/vaadin-confirm-dialog",
314+
"@vaadin/vaadin-context-menu": "$@vaadin/vaadin-context-menu",
315+
"@vaadin/vaadin-custom-field": "$@vaadin/vaadin-custom-field",
316+
"@vaadin/vaadin-date-picker": "$@vaadin/vaadin-date-picker",
317+
"@vaadin/vaadin-date-time-picker": "$@vaadin/vaadin-date-time-picker",
318+
"@vaadin/vaadin-details": "$@vaadin/vaadin-details",
319+
"@vaadin/vaadin-development-mode-detector": "$@vaadin/vaadin-development-mode-detector",
320+
"@vaadin/vaadin-dialog": "$@vaadin/vaadin-dialog",
321+
"@vaadin/vaadin-form-layout": "$@vaadin/vaadin-form-layout",
322+
"@vaadin/vaadin-grid": "$@vaadin/vaadin-grid",
323+
"@vaadin/vaadin-icon": "$@vaadin/vaadin-icon",
324+
"@vaadin/vaadin-icons": "$@vaadin/vaadin-icons",
325+
"@vaadin/vaadin-item": "$@vaadin/vaadin-item",
326+
"@vaadin/vaadin-list-box": "$@vaadin/vaadin-list-box",
327+
"@vaadin/vaadin-list-mixin": "$@vaadin/vaadin-list-mixin",
328+
"@vaadin/vaadin-login": "$@vaadin/vaadin-login",
329+
"@vaadin/vaadin-lumo-styles": "$@vaadin/vaadin-lumo-styles",
330+
"@vaadin/vaadin-material-styles": "$@vaadin/vaadin-material-styles",
331+
"@vaadin/vaadin-menu-bar": "$@vaadin/vaadin-menu-bar",
332+
"@vaadin/vaadin-messages": "$@vaadin/vaadin-messages",
333+
"@vaadin/vaadin-notification": "$@vaadin/vaadin-notification",
334+
"@vaadin/vaadin-ordered-layout": "$@vaadin/vaadin-ordered-layout",
335+
"@vaadin/vaadin-overlay": "$@vaadin/vaadin-overlay",
336+
"@vaadin/vaadin-progress-bar": "$@vaadin/vaadin-progress-bar",
337+
"@vaadin/vaadin-radio-button": "$@vaadin/vaadin-radio-button",
338+
"@vaadin/router": "$@vaadin/router",
339+
"@vaadin/vaadin-select": "$@vaadin/vaadin-select",
340+
"@vaadin/vaadin-split-layout": "$@vaadin/vaadin-split-layout",
341+
"@vaadin/vaadin-tabs": "$@vaadin/vaadin-tabs",
342+
"@vaadin/vaadin-template-renderer": "$@vaadin/vaadin-template-renderer",
343+
"@vaadin/vaadin-text-field": "$@vaadin/vaadin-text-field",
344+
"@vaadin/vaadin-themable-mixin": "$@vaadin/vaadin-themable-mixin",
345+
"@vaadin/vaadin-time-picker": "$@vaadin/vaadin-time-picker",
346+
"@vaadin/vaadin-upload": "$@vaadin/vaadin-upload",
347+
"@vaadin/vaadin-usage-statistics": "$@vaadin/vaadin-usage-statistics",
348+
"@vaadin/vaadin-virtual-list": "$@vaadin/vaadin-virtual-list",
349+
"@vaadin/vertical-layout": "$@vaadin/vertical-layout",
350+
"@vaadin/virtual-list": "$@vaadin/virtual-list",
351+
"@vaadin/common-frontend": "$@vaadin/common-frontend",
352+
"construct-style-sheets-polyfill": "$construct-style-sheets-polyfill",
353+
"lit": "$lit",
354+
"@polymer/polymer": "$@polymer/polymer",
355+
"apexcharts": "$apexcharts",
356+
"date-fns": "$date-fns",
357+
"onecolor": "$onecolor"
66358
}
67359
}

‎pom.xml

+4-6
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
<groupId>com.github.appreciated</groupId>
77
<artifactId>apexcharts</artifactId>
8-
<version>2.0.0-beta13</version>
8+
<version>2.0.0-beta14</version>
99
<name>ApexCharts.js</name>
1010
<description>Integration of ApexCharts.js for the Vaadin platform</description>
1111

1212
<properties>
13-
<vaadin.version>23.1.7</vaadin.version>
13+
<vaadin.version>23.2.0</vaadin.version>
1414
<maven.compiler.source>11</maven.compiler.source>
1515
<maven.compiler.target>11</maven.compiler.target>
1616
<maven.compiler.release>11</maven.compiler.release>
@@ -176,12 +176,12 @@
176176
<dependency>
177177
<groupId>com.vaadin</groupId>
178178
<artifactId>flow-server</artifactId>
179-
<version>23.1.6</version>
179+
<version>${vaadin.version}</version>
180180
</dependency>
181181
<dependency>
182182
<groupId>com.vaadin</groupId>
183183
<artifactId>flow-push</artifactId>
184-
<version>23.1.6</version>
184+
<version>${vaadin.version}</version>
185185
</dependency>
186186
</dependencies>
187187
</plugin>
@@ -214,8 +214,6 @@
214214
<includes>
215215
<include>package.json</include>
216216
<include>package-lock.json</include>
217-
<include>webpack.config.js</include>
218-
<include>webpack.generated.js</include>
219217
</includes>
220218
<followSymlinks>false</followSymlinks>
221219
</fileset>

‎src/main/resources/META-INF/resources/frontend/com/github/appreciated/apexcharts/apexcharts-wrapper.ts

+13-12
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import { html, LitElement } from 'lit';
22
import { customElement } from 'lit/decorators.js';
33
// @ts-ignore
44
import ApexCharts from 'apexcharts/dist/apexcharts.esm';
5+
import '@webcomponents/shadycss/apply-shim.min.js';
6+
import color from "onecolor";
57

68
@customElement('apex-charts-wrapper')
79
export class ApexChartsWrapper extends LitElement {
@@ -91,7 +93,6 @@ export class ApexChartsWrapper extends LitElement {
9193

9294
firstUpdated() {
9395
super.firstUpdated();
94-
this.color = require('onecolor');
9596
const div = document.createElement('div');
9697
this.appendChild(div);
9798
this.updateConfig();
@@ -111,14 +112,14 @@ export class ApexChartsWrapper extends LitElement {
111112

112113
updateConfig() {
113114
let primaryColor;
114-
if (ShadyCSS) {
115-
primaryColor = ShadyCSS.getComputedStyleValue(this, '--apex-charts-primary-color');
115+
if (window.ShadyCSS) {
116+
primaryColor = window.ShadyCSS.getComputedStyleValue(this, '--apex-charts-primary-color');
116117
} else {
117118
primaryColor = getComputedStyle(this).getPropertyValue('--apex-charts-primary-color');
118119
}
119120
var backgroundColor;
120-
if (ShadyCSS) {
121-
backgroundColor = ShadyCSS.getComputedStyleValue(this, '--apex-charts-background-color');
121+
if (window.ShadyCSS) {
122+
backgroundColor = window.ShadyCSS.getComputedStyleValue(this, '--apex-charts-background-color');
122123
} else {
123124
backgroundColor = getComputedStyle(this).getPropertyValue('--apex-charts-background-color');
124125
}
@@ -233,15 +234,15 @@ export class ApexChartsWrapper extends LitElement {
233234
if (this.theme) {
234235
this.config.theme = JSON.parse(this.theme);
235236
} else if (!this.config.fill || !this.config.fill.type || !Array.isArray(this.config.fill.type) || this.config.fill.type[0] !== "gradient") {
236-
if (backgroundColor && this.color(backgroundColor)) {
237+
if (backgroundColor && color(backgroundColor)) {
237238
this.config.theme = {
238-
mode: ((this.color(backgroundColor).lightness() > 0.5) ? 'light' : 'dark')
239+
mode: ((color(backgroundColor).lightness() > 0.5) ? 'light' : 'dark')
239240
};
240241
}
241-
if (!this.colors && primaryColor && this.color(primaryColor)) {
242+
if (!this.colors && primaryColor && color(primaryColor)) {
242243
this.config.theme.monochrome = {
243244
enabled: true,
244-
color: this.color(primaryColor).hex(),
245+
color: color(primaryColor).hex(),
245246
shadeTo: 'light',
246247
shadeIntensity: 0.65
247248
}
@@ -294,19 +295,19 @@ export class ApexChartsWrapper extends LitElement {
294295
if (this.height) {
295296
this.config.chart.height = this.height;
296297
}
297-
if (!this.config.chart.background && backgroundColor && this.color(backgroundColor)) {
298+
if (!this.config.chart.background && backgroundColor && color(backgroundColor)) {
298299
this.config.chart.background = backgroundColor;
299300
}
300301
if (!this.config.stroke) {
301302
this.config.stroke = {};
302303
}
303304
if (this.config.chart && this.config.chart.type === "radar") {
304-
if (!this.config.plotOptions && backgroundColor && this.color(backgroundColor)) {
305+
if (!this.config.plotOptions && backgroundColor && color(backgroundColor)) {
305306
this.config.plotOptions = {
306307
radar: {
307308
polygons: {
308309
fill: {
309-
colors: [this.color(backgroundColor).hex()]
310+
colors: [color(backgroundColor).hex()]
310311
}
311312
}
312313
}

‎vite.config.ts

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import { UserConfigFn } from 'vite';
2+
import { overrideVaadinConfig } from './vite.generated';
3+
4+
const customConfig: UserConfigFn = (env) => ({
5+
// Here you can add custom Vite parameters
6+
// https://vitejs.dev/config/
7+
});
8+
9+
export default overrideVaadinConfig(customConfig);

0 commit comments

Comments
 (0)
Please sign in to comment.