chore: update project and Vaadin to 24.7 (#1134)

mcollovati · Dec 17, 2024 · 5ad7401 · 5ad7401
1 parent 1341f42
commit 5ad7401
Show file tree

Hide file tree

Showing 27 changed files with 5,014 additions and 5,063 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -12,6 +12,16 @@ updates:
     ignore:
       - dependency-name: "com.vaadin.hilla:*"
       - dependency-name: "com.vaadin:*"
+  - package-ecosystem: "maven"
+    directory: "/"
+    target-branch: "24.6"
+    schedule:
+      interval: "daily"
+    ignore:
+      - dependency-name: "com.vaadin.hilla:*"
+        update-types: [ "version-update:semver-major", "version-update:semver-minor"]
+      - dependency-name: "com.vaadin:*"
+        update-types: [ "version-update:semver-major", "version-update:semver-minor"]
   - package-ecosystem: "maven"
     directory: "/"
     target-branch: "24.5"

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -10,6 +10,7 @@ on:
         default: 'main'
         options:
         - "main"
+        - "24.6"
         - "24.5"
         - "24.4"
         - "2.5"

diff --git a/.github/workflows/update-npm-deps.yaml b/.github/workflows/update-npm-deps.yaml
@@ -9,6 +9,7 @@ on:
         default: 'main'
         options:
           - "main"
+          - "24.6"
           - "24.5"
           - "24.4"
           - "2.5"
@@ -28,7 +29,7 @@ jobs:
         id: set-matrix
         run: |
           if [[ -z "${{ inputs.target-branch }}" ]]; then
-            echo 'matrix={ "branch": ["main","24.5","24.4","2.5","1.3"] }' >> "$GITHUB_OUTPUT"
+            echo 'matrix={ "branch": ["main","24.6","24.5","24.4","2.5","1.3"] }' >> "$GITHUB_OUTPUT"
           else
             echo 'matrix={ "branch": ["${{ inputs.target-branch }}"] }' >> "$GITHUB_OUTPUT"
           fi

diff --git a/.github/workflows/validation-nightly.yaml b/.github/workflows/validation-nightly.yaml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: ["main", "24.5", "24.4", "2.5"]
+        branch: ["main", "24.6", "24.5", "24.4", "2.5"]
         java: [ 17, 21 ]
     runs-on: ubuntu-latest
     timeout-minutes: 30

diff --git a/.github/workflows/validation.yaml b/.github/workflows/validation.yaml
@@ -1,7 +1,7 @@
 name: Quarkus Hilla Validation
 on:
   push:
-    branches: [main, '24.5', '24.4', '2.5', '2.4', '2.3', '2.2', '2.1', '2.0', '1.3']
+    branches: [main, '24.6', '24.5', '24.4', '2.5', '2.4', '2.3', '2.2', '2.1', '2.0', '1.3']
   workflow_dispatch:
   pull_request_target:
     types: [opened, synchronize, reopened, edited]

diff --git a/README.md b/README.md
@@ -129,7 +129,7 @@ or download the [starter project](https://github.com/mcollovati/quarkus-hilla-st
 <dependency>
     <groupId>com.github.mcollovati</groupId>
     <artifactId>quarkus-hilla</artifactId>
-    <version>24.5.x</version>
+    <version>24.6.x</version>
 </dependency>
 ```
 
@@ -140,14 +140,15 @@ or
 <dependency>
     <groupId>com.github.mcollovati</groupId>
     <artifactId>quarkus-hilla-react</artifactId>
-    <version>24.5.x</version>
+    <version>24.6.x</version>
 </dependency>
 ```
 
 ## Releases
 
 |                                                                                                         Quarkus-Hilla / Hilla                                                                                                          |                                                                                 Quarkus                                                                                  |                                                                              Vaadin                                                                               |
 |:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------:|
+|        <picture><img alt="Maven Central 24.6" src="https://img.shields.io/maven-central/v/com.github.mcollovati/quarkus-hilla?style=for-the-badge&logo=apache-maven&versionPrefix=24.6" style="visibility: visible;"></picture>        |   <picture><img alt="Quarkus 3.12+" src="https://img.shields.io/badge/QUARKUS-v3.12%2B-blue?style=for-the-badge&logo=Quarkus" style="visibility: visible;"></picture>    | <picture><img alt="Vaadin 24.5" src="https://img.shields.io/badge/VAADIN-v24.6-limegreen?style=for-the-badge&logo=Vaadin" style="visibility: visible;"></picture> |
 |        <picture><img alt="Maven Central 24.5" src="https://img.shields.io/maven-central/v/com.github.mcollovati/quarkus-hilla?style=for-the-badge&logo=apache-maven&versionPrefix=24.5" style="visibility: visible;"></picture>        |   <picture><img alt="Quarkus 3.12+" src="https://img.shields.io/badge/QUARKUS-v3.12%2B-blue?style=for-the-badge&logo=Quarkus" style="visibility: visible;"></picture>    | <picture><img alt="Vaadin 24.5" src="https://img.shields.io/badge/VAADIN-v24.5-limegreen?style=for-the-badge&logo=Vaadin" style="visibility: visible;"></picture> |
 |        <picture><img alt="Maven Central 24.4" src="https://img.shields.io/maven-central/v/com.github.mcollovati/quarkus-hilla?style=for-the-badge&logo=apache-maven&versionPrefix=24.4" style="visibility: visible;"></picture>        | <picture><img alt="Quarkus 3.12+" src="https://img.shields.io/badge/QUARKUS-v3.12%2B-limegreen?style=for-the-badge&logo=Quarkus" style="visibility: visible;"></picture> | <picture><img alt="Vaadin 24.4" src="https://img.shields.io/badge/VAADIN-v24.4-limegreen?style=for-the-badge&logo=Vaadin" style="visibility: visible;"></picture> |
 |         <picture><img alt="Maven Central 2.5" src="https://img.shields.io/maven-central/v/com.github.mcollovati/quarkus-hilla?style=for-the-badge&logo=apache-maven&versionPrefix=2.5" style="visibility: visible;"></picture>         |    <picture><img alt="Quarkus 3.1+" src="https://img.shields.io/badge/QUARKUS-v3.1%2B-blue?style=for-the-badge&logo=Quarkus" style="visibility: visible;"></picture>     |   <picture><img alt="Vaadin 24.2" src="https://img.shields.io/badge/VAADIN-v24.2-blue?style=for-the-badge&logo=Vaadin" style="visibility: visible;"></picture>    |
@@ -161,9 +162,9 @@ or
 
 ## Development
 
-<picture><img alt="Development 24.6-SNAPSHOT" src="https://img.shields.io/badge/GITHUB-24.6--SNAPSHOT-blue?style=for-the-badge&logo=github" style="visibility: visible;"></picture>
-<picture><img alt="Quarkus 3.15+" src="https://img.shields.io/badge/QUARKUS-v3.12%2B-blue?style=for-the-badge&logo=Quarkus" style="visibility: visible;"></picture>
-<picture><img alt="Vaadin 24.6" src="https://img.shields.io/badge/VAADIN-v24.6-blue?style=for-the-badge&logo=Vaadin" style="visibility: visible;"></picture>
+<picture><img alt="Development 24.7-SNAPSHOT" src="https://img.shields.io/badge/GITHUB-24.7--SNAPSHOT-blue?style=for-the-badge&logo=github" style="visibility: visible;"></picture>
+<picture><img alt="Quarkus 3.15+" src="https://img.shields.io/badge/QUARKUS-v3.15%2B-blue?style=for-the-badge&logo=Quarkus" style="visibility: visible;"></picture>
+<picture><img alt="Vaadin 24.7" src="https://img.shields.io/badge/VAADIN-v24.7-blue?style=for-the-badge&logo=Vaadin" style="visibility: visible;"></picture>
 
 ## Build and test
 

diff --git a/integration-tests/custom-prefix-tests/src/main/frontend/util/routing.ts b/integration-tests/custom-prefix-tests/src/main/frontend/util/routing.ts
@@ -1,4 +1,4 @@
-import { useMatches } from 'react-router-dom';
+import { useMatches } from 'react-router';
 
 type RouteMetadata = {
   [key: string]: any;

diff --git a/integration-tests/custom-prefix-tests/src/main/frontend/views/@layout.tsx b/integration-tests/custom-prefix-tests/src/main/frontend/views/@layout.tsx
@@ -3,7 +3,7 @@ import {createMenuItems, useViewConfig} from "@vaadin/hilla-file-router/runtime.
 import Placeholder from 'Frontend/components/placeholder/Placeholder';
 import { Signal, signal, effect } from '@vaadin/hilla-react-signals';
 import {Suspense, useEffect} from 'react';
-import { Outlet, useLocation, useNavigate } from "react-router-dom";
+import { Outlet, useLocation, useNavigate } from "react-router";
 
 const vaadin = window.Vaadin as {
     documentTitleSignal: Signal<string>;
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ on: @@
             default: 'main'
             options:
             - "main"
+            - "24.6"
             - "24.5"
             - "24.4"
             - "2.5"
@@ Expand Down @@