Skip to content

Commit

Permalink
Merge branch 'main' into chore/remove-DevToolsDatabase
Browse files Browse the repository at this point in the history
  • Loading branch information
@mshabarov
mshabarov authored Jan 31, 2024
2 parents 4762290 + e147928 commit ed37881
Show file tree
Hide file tree
Showing 36 changed files with 12,610 additions and 12,604 deletions.
12 changes: 0 additions & 12 deletions packages/java/maven-plugin/src/main/java/com/vaadin/hilla/maven/BuildFrontendMojo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,4 @@
@Execute(goal = "configure")
public class BuildFrontendMojo
extends com.vaadin.flow.plugin.maven.BuildFrontendMojo {
/**
* Override this to not clean generated frontend files after the build. For
* Hilla, the generated files can still be useful for developers after the
* build. For example, a developer can use {@code vite.generated.ts} to run
* tests with vitest in CI.
*
* @return {@code false}
*/
@Override
protected boolean cleanFrontendFiles() {
return false;
}
}
11 changes: 0 additions & 11 deletions packages/java/maven-plugin/src/main/java/com/vaadin/hilla/maven/CleanFrontendMojo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,4 @@
@Mojo(name = "clean-frontend", defaultPhase = LifecyclePhase.PRE_CLEAN)
public class CleanFrontendMojo
extends com.vaadin.flow.plugin.maven.CleanFrontendMojo {

@Override
public void execute() throws MojoFailureException {
getLog().warn(
"""
The 'clean-frontend' goal is not meant to be used in Hilla projects as it delete 'package-lock.json' and also clearing out the content of 'package.json'.
Note: The 'clean-frontend' goal is deprecated and would be removed in future releases.
"""
.stripIndent());
super.execute();
}
}
10 changes: 0 additions & 10 deletions packages/java/maven-plugin/src/main/java/com/vaadin/hilla/maven/ConvertPolymerMojo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,4 @@
public class ConvertPolymerMojo
extends com.vaadin.flow.plugin.maven.ConvertPolymerMojo {

@Override
public void execute() throws MojoFailureException {
getLog().warn(
"""
The 'convert-polymer' goal is not meant to be used in Hilla projects as polymer templates are not supported.
Note: The 'convert-polymer' goal is deprecated and would be removed in future releases.
"""
.stripIndent());
super.execute();
}
}
10 changes: 0 additions & 10 deletions packages/java/maven-plugin/src/main/java/com/vaadin/hilla/maven/FrontendDanceMojo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,4 @@
public class FrontendDanceMojo
extends com.vaadin.flow.plugin.maven.FrontendDanceMojo {

@Override
public void execute() throws MojoFailureException {
getLog().warn(
"""
The 'dance' goal is not meant to be used in Hilla projects as it delete 'package-lock.json' and also clearing out the content of 'package.json'.
Note: The 'dance' goal is deprecated and would be removed in future releases.
"""
.stripIndent());
super.execute();
}
}
2,518 changes: 1,259 additions & 1,259 deletions packages/java/tests/spring/endpoints discovery/package-lock.json
View file

Large diffs are not rendered by default.

262 changes: 131 additions & 131 deletions packages/java/tests/spring/endpoints discovery/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,35 @@
"type": "module",
"dependencies": {
"@polymer/polymer": "3.5.1",
"@vaadin/a11y-base": "24.4.0-alpha8",
"@vaadin/accordion": "24.4.0-alpha8",
"@vaadin/app-layout": "24.4.0-alpha8",
"@vaadin/avatar": "24.4.0-alpha8",
"@vaadin/avatar-group": "24.4.0-alpha8",
"@vaadin/board": "24.4.0-alpha8",
"@vaadin/bundles": "24.4.0-alpha8",
"@vaadin/button": "24.4.0-alpha8",
"@vaadin/charts": "24.4.0-alpha8",
"@vaadin/checkbox": "24.4.0-alpha8",
"@vaadin/checkbox-group": "24.4.0-alpha8",
"@vaadin/combo-box": "24.4.0-alpha8",
"@vaadin/a11y-base": "24.4.0-alpha9",
"@vaadin/accordion": "24.4.0-alpha9",
"@vaadin/app-layout": "24.4.0-alpha9",
"@vaadin/avatar": "24.4.0-alpha9",
"@vaadin/avatar-group": "24.4.0-alpha9",
"@vaadin/board": "24.4.0-alpha9",
"@vaadin/bundles": "24.4.0-alpha9",
"@vaadin/button": "24.4.0-alpha9",
"@vaadin/charts": "24.4.0-alpha9",
"@vaadin/checkbox": "24.4.0-alpha9",
"@vaadin/checkbox-group": "24.4.0-alpha9",
"@vaadin/combo-box": "24.4.0-alpha9",
"@vaadin/common-frontend": "0.0.19",
"@vaadin/component-base": "24.4.0-alpha8",
"@vaadin/confirm-dialog": "24.4.0-alpha8",
"@vaadin/context-menu": "24.4.0-alpha8",
"@vaadin/cookie-consent": "24.4.0-alpha8",
"@vaadin/crud": "24.4.0-alpha8",
"@vaadin/custom-field": "24.4.0-alpha8",
"@vaadin/date-picker": "24.4.0-alpha8",
"@vaadin/date-time-picker": "24.4.0-alpha8",
"@vaadin/details": "24.4.0-alpha8",
"@vaadin/dialog": "24.4.0-alpha8",
"@vaadin/email-field": "24.4.0-alpha8",
"@vaadin/field-base": "24.4.0-alpha8",
"@vaadin/field-highlighter": "24.4.0-alpha8",
"@vaadin/form-layout": "24.4.0-alpha8",
"@vaadin/grid": "24.4.0-alpha8",
"@vaadin/grid-pro": "24.4.0-alpha8",
"@vaadin/component-base": "24.4.0-alpha9",
"@vaadin/confirm-dialog": "24.4.0-alpha9",
"@vaadin/context-menu": "24.4.0-alpha9",
"@vaadin/cookie-consent": "24.4.0-alpha9",
"@vaadin/crud": "24.4.0-alpha9",
"@vaadin/custom-field": "24.4.0-alpha9",
"@vaadin/date-picker": "24.4.0-alpha9",
"@vaadin/date-time-picker": "24.4.0-alpha9",
"@vaadin/details": "24.4.0-alpha9",
"@vaadin/dialog": "24.4.0-alpha9",
"@vaadin/email-field": "24.4.0-alpha9",
"@vaadin/field-base": "24.4.0-alpha9",
"@vaadin/field-highlighter": "24.4.0-alpha9",
"@vaadin/form-layout": "24.4.0-alpha9",
"@vaadin/grid": "24.4.0-alpha9",
"@vaadin/grid-pro": "24.4.0-alpha9",
"@vaadin/hilla-core": "file:../../../../ts/core",
"@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
"@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
Expand All @@ -47,46 +47,46 @@
"@vaadin/hilla-react-auth": "file:../../../../ts/react-auth",
"@vaadin/hilla-react-crud": "file:../../../../ts/react-crud",
"@vaadin/hilla-react-form": "file:../../../../ts/react-form",
"@vaadin/horizontal-layout": "24.4.0-alpha8",
"@vaadin/icon": "24.4.0-alpha8",
"@vaadin/icons": "24.4.0-alpha8",
"@vaadin/input-container": "24.4.0-alpha8",
"@vaadin/integer-field": "24.4.0-alpha8",
"@vaadin/item": "24.4.0-alpha8",
"@vaadin/list-box": "24.4.0-alpha8",
"@vaadin/lit-renderer": "24.4.0-alpha8",
"@vaadin/login": "24.4.0-alpha8",
"@vaadin/map": "24.4.0-alpha8",
"@vaadin/menu-bar": "24.4.0-alpha8",
"@vaadin/message-input": "24.4.0-alpha8",
"@vaadin/message-list": "24.4.0-alpha8",
"@vaadin/multi-select-combo-box": "24.4.0-alpha8",
"@vaadin/notification": "24.4.0-alpha8",
"@vaadin/number-field": "24.4.0-alpha8",
"@vaadin/overlay": "24.4.0-alpha8",
"@vaadin/password-field": "24.4.0-alpha8",
"@vaadin/polymer-legacy-adapter": "24.4.0-alpha8",
"@vaadin/progress-bar": "24.4.0-alpha8",
"@vaadin/radio-group": "24.4.0-alpha8",
"@vaadin/rich-text-editor": "24.4.0-alpha8",
"@vaadin/horizontal-layout": "24.4.0-alpha9",
"@vaadin/icon": "24.4.0-alpha9",
"@vaadin/icons": "24.4.0-alpha9",
"@vaadin/input-container": "24.4.0-alpha9",
"@vaadin/integer-field": "24.4.0-alpha9",
"@vaadin/item": "24.4.0-alpha9",
"@vaadin/list-box": "24.4.0-alpha9",
"@vaadin/lit-renderer": "24.4.0-alpha9",
"@vaadin/login": "24.4.0-alpha9",
"@vaadin/map": "24.4.0-alpha9",
"@vaadin/menu-bar": "24.4.0-alpha9",
"@vaadin/message-input": "24.4.0-alpha9",
"@vaadin/message-list": "24.4.0-alpha9",
"@vaadin/multi-select-combo-box": "24.4.0-alpha9",
"@vaadin/notification": "24.4.0-alpha9",
"@vaadin/number-field": "24.4.0-alpha9",
"@vaadin/overlay": "24.4.0-alpha9",
"@vaadin/password-field": "24.4.0-alpha9",
"@vaadin/polymer-legacy-adapter": "24.4.0-alpha9",
"@vaadin/progress-bar": "24.4.0-alpha9",
"@vaadin/radio-group": "24.4.0-alpha9",
"@vaadin/rich-text-editor": "24.4.0-alpha9",
"@vaadin/router": "1.7.5",
"@vaadin/scroller": "24.4.0-alpha8",
"@vaadin/select": "24.4.0-alpha8",
"@vaadin/side-nav": "24.4.0-alpha8",
"@vaadin/split-layout": "24.4.0-alpha8",
"@vaadin/tabs": "24.4.0-alpha8",
"@vaadin/tabsheet": "24.4.0-alpha8",
"@vaadin/text-area": "24.4.0-alpha8",
"@vaadin/text-field": "24.4.0-alpha8",
"@vaadin/time-picker": "24.4.0-alpha8",
"@vaadin/tooltip": "24.4.0-alpha8",
"@vaadin/upload": "24.4.0-alpha8",
"@vaadin/scroller": "24.4.0-alpha9",
"@vaadin/select": "24.4.0-alpha9",
"@vaadin/side-nav": "24.4.0-alpha9",
"@vaadin/split-layout": "24.4.0-alpha9",
"@vaadin/tabs": "24.4.0-alpha9",
"@vaadin/tabsheet": "24.4.0-alpha9",
"@vaadin/text-area": "24.4.0-alpha9",
"@vaadin/text-field": "24.4.0-alpha9",
"@vaadin/time-picker": "24.4.0-alpha9",
"@vaadin/tooltip": "24.4.0-alpha9",
"@vaadin/upload": "24.4.0-alpha9",
"@vaadin/vaadin-development-mode-detector": "2.0.6",
"@vaadin/vaadin-lumo-styles": "24.4.0-alpha8",
"@vaadin/vaadin-material-styles": "24.4.0-alpha8",
"@vaadin/vaadin-lumo-styles": "24.4.0-alpha9",
"@vaadin/vaadin-material-styles": "24.4.0-alpha9",
"@vaadin/vaadin-usage-statistics": "2.1.2",
"@vaadin/vertical-layout": "24.4.0-alpha8",
"@vaadin/virtual-list": "24.4.0-alpha8",
"@vaadin/vertical-layout": "24.4.0-alpha9",
"@vaadin/virtual-list": "24.4.0-alpha9",
"construct-style-sheets-polyfill": "3.1.0",
"lit": "3.1.1"
},
Expand All @@ -111,35 +111,35 @@
"vaadin": {
"dependencies": {
"@polymer/polymer": "3.5.1",
"@vaadin/a11y-base": "24.4.0-alpha8",
"@vaadin/accordion": "24.4.0-alpha8",
"@vaadin/app-layout": "24.4.0-alpha8",
"@vaadin/avatar": "24.4.0-alpha8",
"@vaadin/avatar-group": "24.4.0-alpha8",
"@vaadin/board": "24.4.0-alpha8",
"@vaadin/bundles": "24.4.0-alpha8",
"@vaadin/button": "24.4.0-alpha8",
"@vaadin/charts": "24.4.0-alpha8",
"@vaadin/checkbox": "24.4.0-alpha8",
"@vaadin/checkbox-group": "24.4.0-alpha8",
"@vaadin/combo-box": "24.4.0-alpha8",
"@vaadin/a11y-base": "24.4.0-alpha9",
"@vaadin/accordion": "24.4.0-alpha9",
"@vaadin/app-layout": "24.4.0-alpha9",
"@vaadin/avatar": "24.4.0-alpha9",
"@vaadin/avatar-group": "24.4.0-alpha9",
"@vaadin/board": "24.4.0-alpha9",
"@vaadin/bundles": "24.4.0-alpha9",
"@vaadin/button": "24.4.0-alpha9",
"@vaadin/charts": "24.4.0-alpha9",
"@vaadin/checkbox": "24.4.0-alpha9",
"@vaadin/checkbox-group": "24.4.0-alpha9",
"@vaadin/combo-box": "24.4.0-alpha9",
"@vaadin/common-frontend": "0.0.19",
"@vaadin/component-base": "24.4.0-alpha8",
"@vaadin/confirm-dialog": "24.4.0-alpha8",
"@vaadin/context-menu": "24.4.0-alpha8",
"@vaadin/cookie-consent": "24.4.0-alpha8",
"@vaadin/crud": "24.4.0-alpha8",
"@vaadin/custom-field": "24.4.0-alpha8",
"@vaadin/date-picker": "24.4.0-alpha8",
"@vaadin/date-time-picker": "24.4.0-alpha8",
"@vaadin/details": "24.4.0-alpha8",
"@vaadin/dialog": "24.4.0-alpha8",
"@vaadin/email-field": "24.4.0-alpha8",
"@vaadin/field-base": "24.4.0-alpha8",
"@vaadin/field-highlighter": "24.4.0-alpha8",
"@vaadin/form-layout": "24.4.0-alpha8",
"@vaadin/grid": "24.4.0-alpha8",
"@vaadin/grid-pro": "24.4.0-alpha8",
"@vaadin/component-base": "24.4.0-alpha9",
"@vaadin/confirm-dialog": "24.4.0-alpha9",
"@vaadin/context-menu": "24.4.0-alpha9",
"@vaadin/cookie-consent": "24.4.0-alpha9",
"@vaadin/crud": "24.4.0-alpha9",
"@vaadin/custom-field": "24.4.0-alpha9",
"@vaadin/date-picker": "24.4.0-alpha9",
"@vaadin/date-time-picker": "24.4.0-alpha9",
"@vaadin/details": "24.4.0-alpha9",
"@vaadin/dialog": "24.4.0-alpha9",
"@vaadin/email-field": "24.4.0-alpha9",
"@vaadin/field-base": "24.4.0-alpha9",
"@vaadin/field-highlighter": "24.4.0-alpha9",
"@vaadin/form-layout": "24.4.0-alpha9",
"@vaadin/grid": "24.4.0-alpha9",
"@vaadin/grid-pro": "24.4.0-alpha9",
"@vaadin/hilla-core": "24.4.0-alpha2",
"@vaadin/hilla-generator-cli": "24.4.0-alpha2",
"@vaadin/hilla-generator-core": "24.4.0-alpha2",
Expand All @@ -151,46 +151,46 @@
"@vaadin/hilla-generator-plugin-subtypes": "24.4.0-alpha2",
"@vaadin/hilla-generator-utils": "24.4.0-alpha2",
"@vaadin/hilla-lit-form": "24.4.0-alpha2",
"@vaadin/horizontal-layout": "24.4.0-alpha8",
"@vaadin/icon": "24.4.0-alpha8",
"@vaadin/icons": "24.4.0-alpha8",
"@vaadin/input-container": "24.4.0-alpha8",
"@vaadin/integer-field": "24.4.0-alpha8",
"@vaadin/item": "24.4.0-alpha8",
"@vaadin/list-box": "24.4.0-alpha8",
"@vaadin/lit-renderer": "24.4.0-alpha8",
"@vaadin/login": "24.4.0-alpha8",
"@vaadin/map": "24.4.0-alpha8",
"@vaadin/menu-bar": "24.4.0-alpha8",
"@vaadin/message-input": "24.4.0-alpha8",
"@vaadin/message-list": "24.4.0-alpha8",
"@vaadin/multi-select-combo-box": "24.4.0-alpha8",
"@vaadin/notification": "24.4.0-alpha8",
"@vaadin/number-field": "24.4.0-alpha8",
"@vaadin/overlay": "24.4.0-alpha8",
"@vaadin/password-field": "24.4.0-alpha8",
"@vaadin/polymer-legacy-adapter": "24.4.0-alpha8",
"@vaadin/progress-bar": "24.4.0-alpha8",
"@vaadin/radio-group": "24.4.0-alpha8",
"@vaadin/rich-text-editor": "24.4.0-alpha8",
"@vaadin/horizontal-layout": "24.4.0-alpha9",
"@vaadin/icon": "24.4.0-alpha9",
"@vaadin/icons": "24.4.0-alpha9",
"@vaadin/input-container": "24.4.0-alpha9",
"@vaadin/integer-field": "24.4.0-alpha9",
"@vaadin/item": "24.4.0-alpha9",
"@vaadin/list-box": "24.4.0-alpha9",
"@vaadin/lit-renderer": "24.4.0-alpha9",
"@vaadin/login": "24.4.0-alpha9",
"@vaadin/map": "24.4.0-alpha9",
"@vaadin/menu-bar": "24.4.0-alpha9",
"@vaadin/message-input": "24.4.0-alpha9",
"@vaadin/message-list": "24.4.0-alpha9",
"@vaadin/multi-select-combo-box": "24.4.0-alpha9",
"@vaadin/notification": "24.4.0-alpha9",
"@vaadin/number-field": "24.4.0-alpha9",
"@vaadin/overlay": "24.4.0-alpha9",
"@vaadin/password-field": "24.4.0-alpha9",
"@vaadin/polymer-legacy-adapter": "24.4.0-alpha9",
"@vaadin/progress-bar": "24.4.0-alpha9",
"@vaadin/radio-group": "24.4.0-alpha9",
"@vaadin/rich-text-editor": "24.4.0-alpha9",
"@vaadin/router": "1.7.5",
"@vaadin/scroller": "24.4.0-alpha8",
"@vaadin/select": "24.4.0-alpha8",
"@vaadin/side-nav": "24.4.0-alpha8",
"@vaadin/split-layout": "24.4.0-alpha8",
"@vaadin/tabs": "24.4.0-alpha8",
"@vaadin/tabsheet": "24.4.0-alpha8",
"@vaadin/text-area": "24.4.0-alpha8",
"@vaadin/text-field": "24.4.0-alpha8",
"@vaadin/time-picker": "24.4.0-alpha8",
"@vaadin/tooltip": "24.4.0-alpha8",
"@vaadin/upload": "24.4.0-alpha8",
"@vaadin/scroller": "24.4.0-alpha9",
"@vaadin/select": "24.4.0-alpha9",
"@vaadin/side-nav": "24.4.0-alpha9",
"@vaadin/split-layout": "24.4.0-alpha9",
"@vaadin/tabs": "24.4.0-alpha9",
"@vaadin/tabsheet": "24.4.0-alpha9",
"@vaadin/text-area": "24.4.0-alpha9",
"@vaadin/text-field": "24.4.0-alpha9",
"@vaadin/time-picker": "24.4.0-alpha9",
"@vaadin/tooltip": "24.4.0-alpha9",
"@vaadin/upload": "24.4.0-alpha9",
"@vaadin/vaadin-development-mode-detector": "2.0.6",
"@vaadin/vaadin-lumo-styles": "24.4.0-alpha8",
"@vaadin/vaadin-material-styles": "24.4.0-alpha8",
"@vaadin/vaadin-lumo-styles": "24.4.0-alpha9",
"@vaadin/vaadin-material-styles": "24.4.0-alpha9",
"@vaadin/vaadin-usage-statistics": "2.1.2",
"@vaadin/vertical-layout": "24.4.0-alpha8",
"@vaadin/virtual-list": "24.4.0-alpha8",
"@vaadin/vertical-layout": "24.4.0-alpha9",
"@vaadin/virtual-list": "24.4.0-alpha9",
"construct-style-sheets-polyfill": "3.1.0",
"lit": "3.1.1"
},
Expand All @@ -212,7 +212,7 @@
"workbox-core": "7.0.0",
"workbox-precaching": "7.0.0"
},
"hash": "01684114b007c4b62e5190d7d58e092e3489032bc7ddeeb1e039b1b7fbde6dcd"
"hash": "de17bf3f815f2e04fb16a6be772d5c78357fae8f2427ca81555069b3b0bb5888"
},
"overrides": {
"@vaadin/common-frontend": "$@vaadin/common-frontend",
Expand Down
Loading

0 comments on commit ed37881

Please sign in to comment.