Merge branch 'main' into feat/1827/default-number-nan

vaadin · Jan 29, 2024 · c9b8d8b · c9b8d8b
2 parents 145fe1a + 6def9a8
commit c9b8d8b
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 6 deletions.
diff --git a/...engine-runtime/src/main/java/com/vaadin/hilla/internal/AbstractTaskEndpointGenerator.java b/...engine-runtime/src/main/java/com/vaadin/hilla/internal/AbstractTaskEndpointGenerator.java
@@ -72,7 +72,7 @@ protected void prepareEngineConfiguration()
             try {
                 // Create a runner for Maven
                 MavenRunner
-                        .forProject(projectDirectory, "-q", "hilla:configure")
+                        .forProject(projectDirectory, "-q", "vaadin:configure")
                         // Create a runner for Gradle. Even if Gradle is not
                         // supported yet, this is useful to emit an error
                         // message if pom.xml is not found and build.gradle is

diff --git a/packages/java/maven-plugin/pom.xml b/packages/java/maven-plugin/pom.xml
@@ -106,6 +106,9 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-plugin-plugin</artifactId>
           <version>3.8.2</version>
+          <configuration>
+            <goalPrefix>vaadin</goalPrefix>
+          </configuration>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/packages/java/tests/gradle/single-module-tests/frontend/routes.tsx b/packages/java/tests/gradle/single-module-tests/frontend/routes.tsx
@@ -28,13 +28,13 @@ export type ViewRouteMatch = Readonly<Override<RouteMatch, ViewMeta>>;
 
 export const useViewMatches = useMatches as () => readonly ViewRouteMatch[];
 
-export const routes: readonly ViewRouteObject[] = [
+export const routes: ViewRouteObject[] = [
   {
     element: <MainLayout />,
     handle: { icon: 'null', title: 'Main' },
     children: [
       { path: '/', element: <HelloReactView />, handle: { icon: 'globe-solid', title: 'Hello React' } },
-      { path: '/about', element: <AboutView />, handle: { icon: 'file', title: 'About' } },
+      { path: '/about', element: <AboutView />, handle: { icon: 'file', title: 'About' } }
     ],
   },
 ];

diff --git a/packages/java/tests/gradle/single-module/frontend/routes.tsx b/packages/java/tests/gradle/single-module/frontend/routes.tsx
@@ -28,13 +28,13 @@ export type ViewRouteMatch = Readonly<Override<RouteMatch, ViewMeta>>;
 
 export const useViewMatches = useMatches as () => readonly ViewRouteMatch[];
 
-export const routes: readonly ViewRouteObject[] = [
+export const routes: ViewRouteObject[] = [
   {
     element: <MainLayout />,
     handle: { icon: 'null', title: 'Main' },
     children: [
       { path: '/', element: <HelloReactView />, handle: { icon: 'globe-solid', title: 'Hello React' } },
-      { path: '/about', element: <AboutView />, handle: { icon: 'file', title: 'About' } },
+      { path: '/about', element: <AboutView />, handle: { icon: 'file', title: 'About' } }
     ],
   },
 ];

diff --git a/packages/java/tests/pom.xml b/packages/java/tests/pom.xml
@@ -148,6 +148,9 @@
                     <groupId>com.vaadin.hilla</groupId>
                     <artifactId>hilla-maven-plugin</artifactId>
                     <version>${project.version}</version>
+                    <configuration>
+                        <reactRouterEnabled>false</reactRouterEnabled>
+                    </configuration>
                     <executions>
                         <execution>
                             <goals>
@@ -255,6 +258,9 @@
                             <groupId>com.vaadin.hilla</groupId>
                             <artifactId>hilla-maven-plugin</artifactId>
                             <version>${project.version}</version>
+                            <configuration>
+                                <reactRouterEnabled>false</reactRouterEnabled>
+                            </configuration>
                             <executions>
                                 <execution>
                                     <goals>

diff --git a/packages/java/tests/spring/react-grid-test/frontend/routes.tsx b/packages/java/tests/spring/react-grid-test/frontend/routes.tsx
@@ -45,7 +45,7 @@ export const routes = [
       {
         path: '/auto-crud',
         element: <AutoCrudView />,
-      },
+      }
     ],
   },
 ];

diff --git a/packages/java/tests/spring/react-grid-test/pom.xml b/packages/java/tests/spring/react-grid-test/pom.xml
@@ -61,6 +61,9 @@
             <plugin>
                 <groupId>com.vaadin.hilla</groupId>
                 <artifactId>hilla-maven-plugin</artifactId>
+                <configuration>
+                    <reactRouterEnabled>true</reactRouterEnabled>
+                </configuration>
             </plugin>
 
             <plugin>
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,7 +45,7 @@ export const routes = [ @@
           {
             path: '/auto-crud',
             element: <AutoCrudView />,
-          },
+          }
         ],
       },
     ];
@@ Expand Down @@