Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: PiT - Update to Vaadin v24 #1355

Merged
merged 2 commits into from
Jun 12, 2024
Merged

chore: PiT - Update to Vaadin v24 #1355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f45fa3b
chore: update to 24.4.1
manolo Jun 11, 2024
22c8aeb
update plugin version
ZheSun88 Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/validation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
run: |
mvn -B -V -ntp verify -Dheadless -Pit,production
- name: Publish Test Results
uses: EnricoMi/publish-unit-test-result-action@v1
uses: EnricoMi/publish-unit-test-result-action@v2
with:
files: "**/target/*-reports/TEST*.xml"
check_run_annotations: all tests, skipped tests
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ webdriver/
.DS_Store

# The following files are generated/updated by vaadin-maven-plugin
frontend/generated/
src/main/frontend/generated/
pnpmfile.js
vite.generated.ts

Expand Down
5,708 changes: 2,989 additions & 2,719 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

275 changes: 56 additions & 219 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,272 +3,109 @@
"license": "UNLICENSED",
"dependencies": {
"@polymer/polymer": "3.5.1",
"@vaadin/a11y-base": "24.3.13",
"@vaadin/accordion": "24.3.13",
"@vaadin/app-layout": "24.3.13",
"@vaadin/avatar": "24.3.13",
"@vaadin/avatar-group": "24.3.13",
"@vaadin/board": "24.3.13",
"@vaadin/bundles": "24.3.13",
"@vaadin/button": "24.3.13",
"@vaadin/charts": "24.3.13",
"@vaadin/checkbox": "24.3.13",
"@vaadin/checkbox-group": "24.3.13",
"@vaadin/combo-box": "24.3.13",
"@vaadin/bundles": "24.4.0",
"@vaadin/common-frontend": "0.0.19",
"@vaadin/component-base": "24.3.13",
"@vaadin/confirm-dialog": "24.3.13",
"@vaadin/context-menu": "24.3.13",
"@vaadin/cookie-consent": "24.3.13",
"@vaadin/crud": "24.3.13",
"@vaadin/custom-field": "24.3.13",
"@vaadin/date-picker": "24.3.13",
"@vaadin/date-time-picker": "24.3.13",
"@vaadin/details": "24.3.13",
"@vaadin/dialog": "24.3.13",
"@vaadin/email-field": "24.3.13",
"@vaadin/field-base": "24.3.13",
"@vaadin/field-highlighter": "24.3.13",
"@vaadin/form-layout": "24.3.13",
"@vaadin/grid": "24.3.13",
"@vaadin/grid-pro": "24.3.13",
"@vaadin/horizontal-layout": "24.3.13",
"@vaadin/icon": "24.3.13",
"@vaadin/icons": "24.3.13",
"@vaadin/input-container": "24.3.13",
"@vaadin/integer-field": "24.3.13",
"@vaadin/item": "24.3.13",
"@vaadin/list-box": "24.3.13",
"@vaadin/lit-renderer": "24.3.13",
"@vaadin/login": "24.3.13",
"@vaadin/map": "24.3.13",
"@vaadin/menu-bar": "24.3.13",
"@vaadin/message-input": "24.3.13",
"@vaadin/message-list": "24.3.13",
"@vaadin/multi-select-combo-box": "24.3.13",
"@vaadin/notification": "24.3.13",
"@vaadin/number-field": "24.3.13",
"@vaadin/overlay": "24.3.13",
"@vaadin/password-field": "24.3.13",
"@vaadin/polymer-legacy-adapter": "24.3.13",
"@vaadin/progress-bar": "24.3.13",
"@vaadin/radio-group": "24.3.13",
"@vaadin/rich-text-editor": "24.3.13",
"@vaadin/polymer-legacy-adapter": "24.4.0",
"@vaadin/react-components": "24.4.0",
"@vaadin/react-components-pro": "24.4.0",
"@vaadin/router": "1.7.5",
"@vaadin/scroller": "24.3.13",
"@vaadin/select": "24.3.13",
"@vaadin/side-nav": "24.3.13",
"@vaadin/split-layout": "24.3.13",
"@vaadin/tabs": "24.3.13",
"@vaadin/tabsheet": "24.3.13",
"@vaadin/text-area": "24.3.13",
"@vaadin/text-field": "24.3.13",
"@vaadin/time-picker": "24.3.13",
"@vaadin/tooltip": "24.3.13",
"@vaadin/upload": "24.3.13",
"@vaadin/vaadin-development-mode-detector": "2.0.7",
"@vaadin/vaadin-lumo-styles": "24.3.13",
"@vaadin/vaadin-material-styles": "24.3.13",
"@vaadin/vaadin-themable-mixin": "24.3.13",
"@vaadin/vaadin-lumo-styles": "24.4.0",
"@vaadin/vaadin-material-styles": "24.4.0",
"@vaadin/vaadin-themable-mixin": "24.4.0",
"@vaadin/vaadin-usage-statistics": "2.1.2",
"@vaadin/vertical-layout": "24.3.13",
"@vaadin/virtual-list": "24.3.13",
"construct-style-sheets-polyfill": "3.1.0",
"date-fns": "2.29.3",
"lit": "3.1.2",
"proj4": "2.9.2"
"lit": "3.1.4",
"proj4": "2.11.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-router-dom": "6.23.1"
},
"devDependencies": {
"@rollup/plugin-replace": "5.0.5",
"@babel/preset-react": "7.24.7",
"@rollup/plugin-replace": "5.0.7",
"@rollup/pluginutils": "5.1.0",
"@vitejs/plugin-react": "4.2.1",
"@vitejs/plugin-react-swc": "3.5.0",
"async": "3.2.4",
"glob": "10.3.3",
"@types/react": "18.3.3",
"@types/react-dom": "18.3.0",
"@vitejs/plugin-react": "4.3.1",
"async": "3.2.5",
"glob": "10.4.1",
"rollup-plugin-brotli": "3.1.0",
"rollup-plugin-visualizer": "5.12.0",
"strip-css-comments": "5.0.0",
"transform-ast": "2.4.4",
"typescript": "5.3.3",
"vite": "5.1.7",
"typescript": "5.4.5",
"vite": "5.2.13",
"vite-plugin-checker": "0.6.4",
"workbox-build": "7.0.0",
"workbox-core": "7.0.0",
"workbox-precaching": "7.0.0"
"workbox-build": "7.1.1",
"workbox-core": "7.1.0",
"workbox-precaching": "7.1.0"
},
"vaadin": {
"dependencies": {
"@polymer/polymer": "3.5.1",
"@vaadin/a11y-base": "24.3.13",
"@vaadin/accordion": "24.3.13",
"@vaadin/app-layout": "24.3.13",
"@vaadin/avatar": "24.3.13",
"@vaadin/avatar-group": "24.3.13",
"@vaadin/board": "24.3.13",
"@vaadin/bundles": "24.3.13",
"@vaadin/button": "24.3.13",
"@vaadin/charts": "24.3.13",
"@vaadin/checkbox": "24.3.13",
"@vaadin/checkbox-group": "24.3.13",
"@vaadin/combo-box": "24.3.13",
"@vaadin/bundles": "24.4.0",
"@vaadin/common-frontend": "0.0.19",
"@vaadin/component-base": "24.3.13",
"@vaadin/confirm-dialog": "24.3.13",
"@vaadin/context-menu": "24.3.13",
"@vaadin/cookie-consent": "24.3.13",
"@vaadin/crud": "24.3.13",
"@vaadin/custom-field": "24.3.13",
"@vaadin/date-picker": "24.3.13",
"@vaadin/date-time-picker": "24.3.13",
"@vaadin/details": "24.3.13",
"@vaadin/dialog": "24.3.13",
"@vaadin/email-field": "24.3.13",
"@vaadin/field-base": "24.3.13",
"@vaadin/field-highlighter": "24.3.13",
"@vaadin/form-layout": "24.3.13",
"@vaadin/grid": "24.3.13",
"@vaadin/grid-pro": "24.3.13",
"@vaadin/horizontal-layout": "24.3.13",
"@vaadin/icon": "24.3.13",
"@vaadin/icons": "24.3.13",
"@vaadin/input-container": "24.3.13",
"@vaadin/integer-field": "24.3.13",
"@vaadin/item": "24.3.13",
"@vaadin/list-box": "24.3.13",
"@vaadin/lit-renderer": "24.3.13",
"@vaadin/login": "24.3.13",
"@vaadin/map": "24.3.13",
"@vaadin/menu-bar": "24.3.13",
"@vaadin/message-input": "24.3.13",
"@vaadin/message-list": "24.3.13",
"@vaadin/multi-select-combo-box": "24.3.13",
"@vaadin/notification": "24.3.13",
"@vaadin/number-field": "24.3.13",
"@vaadin/overlay": "24.3.13",
"@vaadin/password-field": "24.3.13",
"@vaadin/polymer-legacy-adapter": "24.3.13",
"@vaadin/progress-bar": "24.3.13",
"@vaadin/radio-group": "24.3.13",
"@vaadin/rich-text-editor": "24.3.13",
"@vaadin/polymer-legacy-adapter": "24.4.0",
"@vaadin/react-components": "24.4.0",
"@vaadin/react-components-pro": "24.4.0",
"@vaadin/router": "1.7.5",
"@vaadin/scroller": "24.3.13",
"@vaadin/select": "24.3.13",
"@vaadin/side-nav": "24.3.13",
"@vaadin/split-layout": "24.3.13",
"@vaadin/tabs": "24.3.13",
"@vaadin/tabsheet": "24.3.13",
"@vaadin/text-area": "24.3.13",
"@vaadin/text-field": "24.3.13",
"@vaadin/time-picker": "24.3.13",
"@vaadin/tooltip": "24.3.13",
"@vaadin/upload": "24.3.13",
"@vaadin/vaadin-development-mode-detector": "2.0.7",
"@vaadin/vaadin-lumo-styles": "24.3.13",
"@vaadin/vaadin-material-styles": "24.3.13",
"@vaadin/vaadin-themable-mixin": "24.3.13",
"@vaadin/vaadin-lumo-styles": "24.4.0",
"@vaadin/vaadin-material-styles": "24.4.0",
"@vaadin/vaadin-themable-mixin": "24.4.0",
"@vaadin/vaadin-usage-statistics": "2.1.2",
"@vaadin/vertical-layout": "24.3.13",
"@vaadin/virtual-list": "24.3.13",
"construct-style-sheets-polyfill": "3.1.0",
"date-fns": "2.29.3",
"lit": "3.1.2",
"proj4": "2.9.2"
"lit": "3.1.4",
"proj4": "2.11.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-router-dom": "6.23.1"
},
"devDependencies": {
"@rollup/plugin-replace": "5.0.5",
"@babel/preset-react": "7.24.7",
"@rollup/plugin-replace": "5.0.7",
"@rollup/pluginutils": "5.1.0",
"@vitejs/plugin-react": "4.2.1",
"@vitejs/plugin-react-swc": "3.5.0",
"async": "3.2.4",
"glob": "10.3.3",
"@types/react": "18.3.3",
"@types/react-dom": "18.3.0",
"@vitejs/plugin-react": "4.3.1",
"async": "3.2.5",
"glob": "10.4.1",
"rollup-plugin-brotli": "3.1.0",
"rollup-plugin-visualizer": "5.12.0",
"strip-css-comments": "5.0.0",
"transform-ast": "2.4.4",
"typescript": "5.3.3",
"vite": "5.1.7",
"typescript": "5.4.5",
"vite": "5.2.13",
"vite-plugin-checker": "0.6.4",
"workbox-build": "7.0.0",
"workbox-core": "7.0.0",
"workbox-precaching": "7.0.0"
"workbox-build": "7.1.1",
"workbox-core": "7.1.0",
"workbox-precaching": "7.1.0"
},
"hash": "9a2623ca146fd7637cd03b16c2cfe2ab0b4af89e0e27be7d55229e915b1eaa61"
"hash": "8c7bcee90dbe778cf84669d75b7caab1584656ccb3d3d5ae229b318eb4becf67"
},
"overrides": {
"@vaadin/bundles": "$@vaadin/bundles",
"@vaadin/accordion": "$@vaadin/accordion",
"@vaadin/app-layout": "$@vaadin/app-layout",
"@vaadin/avatar": "$@vaadin/avatar",
"@vaadin/avatar-group": "$@vaadin/avatar-group",
"@vaadin/button": "$@vaadin/button",
"@vaadin/checkbox": "$@vaadin/checkbox",
"@vaadin/checkbox-group": "$@vaadin/checkbox-group",
"@vaadin/combo-box": "$@vaadin/combo-box",
"@vaadin/component-base": "$@vaadin/component-base",
"@vaadin/context-menu": "$@vaadin/context-menu",
"@vaadin/custom-field": "$@vaadin/custom-field",
"@vaadin/date-picker": "$@vaadin/date-picker",
"@vaadin/date-time-picker": "$@vaadin/date-time-picker",
"@vaadin/details": "$@vaadin/details",
"@vaadin/dialog": "$@vaadin/dialog",
"@vaadin/email-field": "$@vaadin/email-field",
"@vaadin/field-base": "$@vaadin/field-base",
"@vaadin/field-highlighter": "$@vaadin/field-highlighter",
"@vaadin/form-layout": "$@vaadin/form-layout",
"@vaadin/grid": "$@vaadin/grid",
"@vaadin/horizontal-layout": "$@vaadin/horizontal-layout",
"@vaadin/icon": "$@vaadin/icon",
"@vaadin/icons": "$@vaadin/icons",
"@vaadin/input-container": "$@vaadin/input-container",
"@vaadin/integer-field": "$@vaadin/integer-field",
"@vaadin/item": "$@vaadin/item",
"@vaadin/list-box": "$@vaadin/list-box",
"@vaadin/login": "$@vaadin/login",
"@vaadin/menu-bar": "$@vaadin/menu-bar",
"@vaadin/message-input": "$@vaadin/message-input",
"@vaadin/message-list": "$@vaadin/message-list",
"@vaadin/notification": "$@vaadin/notification",
"@vaadin/number-field": "$@vaadin/number-field",
"@vaadin/password-field": "$@vaadin/password-field",
"@vaadin/polymer-legacy-adapter": "$@vaadin/polymer-legacy-adapter",
"@vaadin/progress-bar": "$@vaadin/progress-bar",
"@vaadin/radio-group": "$@vaadin/radio-group",
"@vaadin/scroller": "$@vaadin/scroller",
"@vaadin/select": "$@vaadin/select",
"@vaadin/split-layout": "$@vaadin/split-layout",
"@vaadin/tabs": "$@vaadin/tabs",
"@vaadin/text-area": "$@vaadin/text-area",
"@vaadin/text-field": "$@vaadin/text-field",
"@vaadin/time-picker": "$@vaadin/time-picker",
"@vaadin/upload": "$@vaadin/upload",
"@vaadin/vaadin-development-mode-detector": "$@vaadin/vaadin-development-mode-detector",
"@vaadin/vaadin-lumo-styles": "$@vaadin/vaadin-lumo-styles",
"@vaadin/vaadin-material-styles": "$@vaadin/vaadin-material-styles",
"@vaadin/router": "$@vaadin/router",
"@vaadin/vaadin-themable-mixin": "$@vaadin/vaadin-themable-mixin",
"@vaadin/vaadin-usage-statistics": "$@vaadin/vaadin-usage-statistics",
"@vaadin/vertical-layout": "$@vaadin/vertical-layout",
"@vaadin/virtual-list": "$@vaadin/virtual-list",
"@vaadin/board": "$@vaadin/board",
"@vaadin/charts": "$@vaadin/charts",
"@vaadin/confirm-dialog": "$@vaadin/confirm-dialog",
"@vaadin/cookie-consent": "$@vaadin/cookie-consent",
"@vaadin/crud": "$@vaadin/crud",
"@vaadin/grid-pro": "$@vaadin/grid-pro",
"@vaadin/map": "$@vaadin/map",
"@vaadin/rich-text-editor": "$@vaadin/rich-text-editor",
"@polymer/polymer": "$@polymer/polymer",
"construct-style-sheets-polyfill": "$construct-style-sheets-polyfill",
"@vaadin/common-frontend": "$@vaadin/common-frontend",
"lit": "$lit",
"date-fns": "$date-fns",
"@vaadin/lit-renderer": "$@vaadin/lit-renderer",
"@vaadin/multi-select-combo-box": "$@vaadin/multi-select-combo-box",
"proj4": "$proj4",
"@vaadin/tabsheet": "$@vaadin/tabsheet",
"@vaadin/tooltip": "$@vaadin/tooltip",
"@vaadin/overlay": "$@vaadin/overlay",
"@vaadin/a11y-base": "$@vaadin/a11y-base",
"@vaadin/side-nav": "$@vaadin/side-nav"
}
"@vaadin/react-components": "$@vaadin/react-components",
"@vaadin/react-components-pro": "$@vaadin/react-components-pro",
"react-dom": "$react-dom",
"react-router-dom": "$react-router-dom",
"react": "$react"
},
"type": "module"
}
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<failOnMissingWebXml>false</failOnMissingWebXml>

<!-- Dependencies -->
<vaadin.version>24.3.13</vaadin.version>
<vaadin.version>24.4.1</vaadin.version>

<!-- selenium is so much verbose -->
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
Expand Down
0 frontend/index.html → src/main/frontend/index.html
View file
Open in desktop
File renamed without changes.
0 frontend/src/components/buttons-bar.js → ...in/frontend/src/components/buttons-bar.js
View file
Open in desktop
File renamed without changes.
0 frontend/src/components/search-bar.js → ...ain/frontend/src/components/search-bar.js
View file
Open in desktop
File renamed without changes.
0 frontend/src/components/utils-mixin.js → ...in/frontend/src/components/utils-mixin.js
View file
Open in desktop
File renamed without changes.
0 ...iews/dashboard/dashboard-counter-label.js → ...iews/dashboard/dashboard-counter-label.js
View file
Open in desktop
File renamed without changes.
0 ...end/src/views/dashboard/dashboard-view.js → ...end/src/views/dashboard/dashboard-view.js
View file
Open in desktop
File renamed without changes.
0 ...tend/src/views/orderedit/order-details.js → ...tend/src/views/orderedit/order-details.js
View file
Open in desktop
File renamed without changes.
0 frontend/src/views/orderedit/order-editor.js → ...ntend/src/views/orderedit/order-editor.js
View file
Open in desktop
File renamed without changes.
0 .../src/views/orderedit/order-item-editor.js → .../src/views/orderedit/order-item-editor.js
View file
Open in desktop
File renamed without changes.
0 frontend/src/views/storefront/order-card.js → ...ontend/src/views/storefront/order-card.js
View file
Open in desktop
File renamed without changes.
0 ...rc/views/storefront/order-status-badge.js → ...rc/views/storefront/order-status-badge.js
View file
Open in desktop
File renamed without changes.
0 ...d/src/views/storefront/storefront-view.js → ...d/src/views/storefront/storefront-view.js
View file
Open in desktop
File renamed without changes.
0 frontend/styles/shared-styles.js → src/main/frontend/styles/shared-styles.js
View file
Open in desktop
File renamed without changes.
0 ...s/bakery/components/vaadin-app-layout.css → ...s/bakery/components/vaadin-app-layout.css
View file
Open in desktop
File renamed without changes.
0 ...themes/bakery/components/vaadin-chart.css → ...themes/bakery/components/vaadin-chart.css
View file
Open in desktop
File renamed without changes.
0 ...es/bakery/components/vaadin-combo-box.css → ...es/bakery/components/vaadin-combo-box.css
View file
Open in desktop
File renamed without changes.
0 .../themes/bakery/components/vaadin-crud.css → .../themes/bakery/components/vaadin-crud.css
View file
Open in desktop
File renamed without changes.
0 ...kery/components/vaadin-dialog-overlay.css → ...kery/components/vaadin-dialog-overlay.css
View file
Open in desktop
File renamed without changes.
0 .../themes/bakery/components/vaadin-grid.css → .../themes/bakery/components/vaadin-grid.css
View file
Open in desktop
File renamed without changes.
0 ...mponents/vaadin-login-overlay-wrapper.css → ...mponents/vaadin-login-overlay-wrapper.css
View file
Open in desktop
File renamed without changes.
0 ...s/bakery/components/vaadin-text-field.css → ...s/bakery/components/vaadin-text-field.css
View file
Open in desktop
File renamed without changes.
0 frontend/themes/bakery/styles.css → src/main/frontend/themes/bakery/styles.css
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions src/main/frontend/views/README
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Place your React views or hand written templates in this folder.
8 changes: 4 additions & 4 deletions tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// You might want to change the configurations to fit your preferences
// For more information about the configurations, please refer to http://www.typescriptlang.org/docs/handbook/tsconfig-json.html
{
"_version": "9",
"_version": "9.1",
"compilerOptions": {
"sourceMap": true,
"jsx": "react-jsx",
Expand All @@ -22,18 +22,18 @@
"noUnusedParameters": false,
"experimentalDecorators": true,
"useDefineForClassFields": false,
"baseUrl": "frontend",
"baseUrl": "src/main/frontend",
"paths": {
"@vaadin/flow-frontend": ["generated/jar-resources"],
"@vaadin/flow-frontend/*": ["generated/jar-resources/*"],
"Frontend/*": ["*"]
}
},
"include": [
"frontend/**/*",
"src/main/frontend/**/*",
"types.d.ts"
],
"exclude": [
"frontend/generated/jar-resources/**"
"src/main/frontend/generated/jar-resources/**"
]
}
Loading