Merge branch 'main' into feat/avoid-running-maven

vaadin · Dec 10, 2024 · 590b42b · 590b42b
2 parents a79453e + b66ec1a
commit 590b42b
Show file tree

Hide file tree

Showing 78 changed files with 3,081 additions and 2,872 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -34,44 +34,44 @@
   },
   "devDependencies": {
     "@nx/js": "^18.0.4",
-    "@preact/signals-react-transform": "^0.3.1",
-    "@remcovaes/web-test-runner-vite-plugin": "^1.2.1",
-    "@types/karma": "^6.3.8",
-    "@types/node": "^20.11.19",
+    "@preact/signals-react-transform": "^0.4.0",
+    "@remcovaes/web-test-runner-vite-plugin": "^1.2.2",
+    "@types/karma": "^6.3.9",
+    "@types/node": "^22.10.1",
     "@vaadin/react-components": "24.6.0-rc1",
-    "@vitejs/plugin-react": "^4.3.1",
+    "@vitejs/plugin-react": "^4.3.4",
     "@web/test-runner": "^0.19.0",
     "chai-dom": "^1.12.0",
-    "compare-versions": "^6.1.0",
+    "compare-versions": "^6.1.1",
     "concurrently": "^8.2.2",
     "cssnano": "^6.0.3",
-    "esbuild": "^0.20.1",
+    "esbuild": "^0.24.0",
     "eslint": "^8.56.0",
     "eslint-config-vaadin": "1.0.0-alpha.18",
     "eslint-plugin-mocha": "^10.3.0",
     "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-tsdoc": "^0.2.17",
     "glob": "^10.3.10",
-    "karma": "^6.4.3",
+    "karma": "^6.4.4",
     "karma-chrome-launcher": "^3.2.0",
     "karma-coverage": "^2.2.1",
     "karma-mocha": "^2.0.1",
     "karma-spec-reporter": "^0.0.36",
     "karma-viewport": "^1.0.9",
     "karma-vite": "^1.0.5",
-    "lint-staged": "^15.2.2",
-    "magic-string": "^0.30.7",
+    "lint-staged": "^15.2.10",
+    "magic-string": "^0.30.14",
     "meow": "^13.2.0",
-    "micromatch": "^4.0.5",
+    "micromatch": "^4.0.8",
     "mocha": "^10.3.0",
     "nx": "^18.0.4",
-    "postcss": "^8.4.35",
+    "postcss": "^8.4.49",
     "prettier": "^3.2.5",
-    "simple-git-hooks": "^2.9.0",
+    "simple-git-hooks": "^2.11.1",
     "sync-request": "^6.1.0",
-    "tsx": "^4.16.2",
-    "type-fest": "^4.28.1",
-    "typescript": "5.6.2",
-    "vite": "5.4.6"
+    "tsx": "^4.19.2",
+    "type-fest": "^4.30.0",
+    "typescript": "5.7.2",
+    "vite": "^5.4.11"
   }
 }
diff --git a/...dle-plugin/src/functionalTest/kotlin/com/vaadin/hilla/gradle/plugin/AbstractGradleTest.kt b/...dle-plugin/src/functionalTest/kotlin/com/vaadin/hilla/gradle/plugin/AbstractGradleTest.kt
@@ -26,7 +26,7 @@ import org.junit.Before
 abstract class AbstractGradleTest {
 
     val hillaVersion = System.getenv("hilla.version").takeUnless { it.isNullOrEmpty() } ?: "24.7-SNAPSHOT"
-    val flowVersion = System.getenv("flow.version").takeUnless { it.isNullOrEmpty() } ?: "24.6-SNAPSHOT"
+    val flowVersion = System.getenv("flow.version").takeUnless { it.isNullOrEmpty() } ?: "24.7-SNAPSHOT"
     /**
      * The testing Gradle project. Automatically deleted after every test.
      * Don't use TemporaryFolder JUnit `@Rule` since it will always delete the folder afterward,

diff --git a/packages/java/tests/csrf-context/package-lock.json b/packages/java/tests/csrf-context/package-lock.json
diff --git a/packages/java/tests/csrf/package-lock.json b/packages/java/tests/csrf/package-lock.json
diff --git a/packages/java/tests/gradle/single-module-tests/frontend/App.tsx b/packages/java/tests/gradle/single-module-tests/frontend/App.tsx
@@ -1,5 +1,5 @@
 import router from 'Frontend/routes.js';
-import { RouterProvider } from 'react-router-dom';
+import { RouterProvider } from 'react-router';
 
 export default function App() {
   return <RouterProvider router={router} />;

diff --git a/packages/java/tests/gradle/single-module-tests/frontend/_views/MainLayout.tsx b/packages/java/tests/gradle/single-module-tests/frontend/_views/MainLayout.tsx
@@ -5,7 +5,7 @@ import { Scroller } from '@vaadin/react-components/Scroller.js';
 import Placeholder from 'Frontend/components/placeholder/Placeholder.js';
 import { MenuProps, routes, useViewMatches, ViewRouteObject } from 'Frontend/routes.js';
 import { Suspense } from 'react';
-import { NavLink, Outlet } from 'react-router-dom';
+import { NavLink, Outlet } from 'react-router';
 import css from './MainLayout.module.css';
 
 type MenuRoute = ViewRouteObject &

diff --git a/packages/java/tests/gradle/single-module-tests/frontend/routes.tsx b/packages/java/tests/gradle/single-module-tests/frontend/routes.tsx
@@ -1,7 +1,7 @@
 import HelloReactView from './_views/helloreact/HelloReactView.js';
 import MainLayout from './_views/MainLayout.js';
 import { lazy } from 'react';
-import { createBrowserRouter, IndexRouteObject, NonIndexRouteObject, useMatches } from 'react-router-dom';
+import { createBrowserRouter, IndexRouteObject, NonIndexRouteObject, useMatches } from 'react-router';
 
 const AboutView = lazy(async () => import('./_views/about/AboutView.js'));
 export type MenuProps = Readonly<{

diff --git a/packages/java/tests/gradle/single-module-tests/gradle.properties b/packages/java/tests/gradle/single-module-tests/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.daemon=false
 hillaVersion=24.7-SNAPSHOT
-flowVersion=24.6-SNAPSHOT
-vaadinComponentsVersion=24.6-SNAPSHOT
+flowVersion=24.7-SNAPSHOT
+vaadinComponentsVersion=24.7-SNAPSHOT