Skip to content

Commit

Permalink
Merge branch 'main' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
Yue-plus authored Jun 22, 2024
2 parents d9adbc3 + 4030b12 commit 31fe0c0
Show file tree
Hide file tree
Showing 33 changed files with 2,629 additions and 2,657 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ for Java
![Latest Stable Version](https://img.shields.io/npm/v/@hilla/frontend.svg)
[![Releases](https://img.shields.io/maven-metadata/v?metadataUrl=https%3A%2F%2Frepo1.maven.org%2Fmaven2%2Fdev%2Fhilla%2Fhilla%2Fmaven-metadata.xml)](https://github.com/vaadin/hilla/releases)

[hilla.dev](https://hilla.dev) · [Docs](https://hilla.dev/docs) · [Chat](https://discord.gg/MYFq5RTbBn)
[hilla.dev](https://hilla.dev) · [Docs](https://hilla.dev/docs) · [Forum](https://vaadin.com/forum/c/hilla/18)

</div>

Expand Down Expand Up @@ -83,7 +83,7 @@ Follow the tutorials at https://hilla.dev/docs

## Contributing

The best way to contribute is to try out Hilla and provide feedback to the development team in our [Discord chat](https://discord.gg/MYFq5RTbBn) or with [GitHub issues](https://github.com/vaadin/hilla/issues).
The best way to contribute is to try out Hilla and provide feedback to the development team in our [Forum](https://vaadin.com/forum/c/hilla/18) or with [GitHub issues](https://github.com/vaadin/hilla/issues).

### Development

Expand Down
2 changes: 1 addition & 1 deletion packages/java/maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<name>Maven Plugin for Hilla Engine</name>

<properties>
<maven.version>3.9.6</maven.version>
<maven.version>3.9.7</maven.version>
<formatter.basedir>${project.parent.basedir}</formatter.basedir>
</properties>

Expand Down
402 changes: 201 additions & 201 deletions packages/java/tests/csrf-context/package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions packages/java/tests/csrf-context/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"strip-css-comments": "5.0.0",
"transform-ast": "2.4.4",
"typescript": "5.4.5",
"vite": "5.2.13",
"vite": "5.3.1",
"vite-plugin-checker": "0.6.4",
"workbox-build": "7.1.1",
"workbox-core": "7.1.0",
Expand Down Expand Up @@ -81,13 +81,13 @@
"strip-css-comments": "5.0.0",
"transform-ast": "2.4.4",
"typescript": "5.4.5",
"vite": "5.2.13",
"vite": "5.3.1",
"vite-plugin-checker": "0.6.4",
"workbox-build": "7.1.1",
"workbox-core": "7.1.0",
"workbox-precaching": "7.1.0"
},
"hash": "326f75040217b439f19550504ef7fd2cdd9de540e2193b8a4421652ac4b337d6"
"hash": "36fff5033d1fb0e976c6e4724a8dba7630893252b1d1ca7385732cc67570d5e9"
},
"overrides": {
"@vaadin/common-frontend": "$@vaadin/common-frontend",
Expand Down
Loading

0 comments on commit 31fe0c0

Please sign in to comment.