chore: upgrade vaadin 24.7.0.alpha1

vaadin · Dec 19, 2024 · 5c96641 · 5c96641
1 parent 472f9b3
commit 5c96641
Show file tree

Hide file tree

Showing 9 changed files with 2,523 additions and 2,369 deletions.
diff --git a/frontend/demo/auth/App.tsx b/frontend/demo/auth/App.tsx
@@ -1,4 +1,4 @@
-import { RouterProvider } from 'react-router-dom';
+import { RouterProvider } from 'react-router';
 import { AuthProvider } from './auth';
 import router from './routes';
 

diff --git a/frontend/demo/auth/MainLayout.tsx b/frontend/demo/auth/MainLayout.tsx
@@ -1,5 +1,5 @@
 import { Suspense } from 'react';
-import { NavLink, Outlet } from 'react-router-dom';
+import { NavLink, Outlet } from 'react-router';
 import { AppLayout } from '@vaadin/react-components/AppLayout.js';
 import { Button } from '@vaadin/react-components/Button.js';
 import { DrawerToggle } from '@vaadin/react-components/DrawerToggle.js';

diff --git a/frontend/demo/auth/index.tsx b/frontend/demo/auth/index.tsx
@@ -1,7 +1,7 @@
 // tag::snippet[]
 import { createElement } from 'react';
 import { createRoot } from 'react-dom/client';
-import { RouterProvider } from 'react-router-dom';
+import { RouterProvider } from 'react-router';
 import { AuthProvider } from './auth';
 import router from './routes';
 

diff --git a/frontend/demo/auth/routes.tsx b/frontend/demo/auth/routes.tsx
@@ -1,4 +1,4 @@
-import { createBrowserRouter, type RouteObject } from 'react-router-dom';
+import { createBrowserRouter, type RouteObject } from 'react-router';
 import { protectRoutes } from '@vaadin/hilla-react-auth';
 import AboutView from './AboutView';
 import LoginView from './LoginView';

diff --git a/frontend/demo/auth/routing.ts b/frontend/demo/auth/routing.ts
@@ -1,4 +1,4 @@
-import { useMatches } from 'react-router-dom';
+import { useMatches } from 'react-router';
 
 type RouteMetadata = Record<string, any>;
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -9,24 +9,24 @@
     "@opentelemetry/instrumentation-xml-http-request": "0.34.0",
     "@opentelemetry/sdk-trace-web": "1.8.0",
     "@polymer/polymer": "3.5.2",
-    "@vaadin/bundles": "24.6.0",
+    "@vaadin/bundles": "24.7.0-alpha2",
     "@vaadin/common-frontend": "0.0.19",
-    "@vaadin/hilla-file-router": "24.6.0",
-    "@vaadin/hilla-frontend": "24.6.0",
-    "@vaadin/hilla-lit-form": "24.6.0",
-    "@vaadin/hilla-react-auth": "24.6.0",
-    "@vaadin/hilla-react-crud": "24.6.0",
-    "@vaadin/hilla-react-form": "24.6.0",
-    "@vaadin/hilla-react-i18n": "24.6.0",
-    "@vaadin/hilla-react-signals": "24.6.0",
-    "@vaadin/polymer-legacy-adapter": "24.6.0",
-    "@vaadin/react-components": "24.6.0",
-    "@vaadin/react-components-pro": "24.6.0",
+    "@vaadin/hilla-file-router": "24.7.0-alpha3",
+    "@vaadin/hilla-frontend": "24.7.0-alpha3",
+    "@vaadin/hilla-lit-form": "24.7.0-alpha3",
+    "@vaadin/hilla-react-auth": "24.7.0-alpha3",
+    "@vaadin/hilla-react-crud": "24.7.0-alpha3",
+    "@vaadin/hilla-react-form": "24.7.0-alpha3",
+    "@vaadin/hilla-react-i18n": "24.7.0-alpha3",
+    "@vaadin/hilla-react-signals": "24.7.0-alpha3",
+    "@vaadin/polymer-legacy-adapter": "24.7.0-alpha2",
+    "@vaadin/react-components": "24.7.0-alpha2",
+    "@vaadin/react-components-pro": "24.7.0-alpha2",
     "@vaadin/router": "2.0.0",
     "@vaadin/vaadin-development-mode-detector": "2.0.7",
-    "@vaadin/vaadin-lumo-styles": "24.6.0",
-    "@vaadin/vaadin-material-styles": "24.6.0",
-    "@vaadin/vaadin-themable-mixin": "24.6.0",
+    "@vaadin/vaadin-lumo-styles": "24.7.0-alpha2",
+    "@vaadin/vaadin-material-styles": "24.7.0-alpha2",
+    "@vaadin/vaadin-themable-mixin": "24.7.0-alpha2",
     "@vaadin/vaadin-usage-statistics": "2.1.3",
     "construct-style-sheets-polyfill": "3.1.0",
     "core-js": "^3.32.1",
@@ -38,7 +38,7 @@
     "react": "18.3.1",
     "react-colorful": "5.6.1",
     "react-dom": "18.3.1",
-    "react-router-dom": "6.28.0",
+    "react-router": "7.0.2",
     "vanilla-colorful": "^0.5.3"
   },
   "devDependencies": {
@@ -50,16 +50,16 @@
     "@types/node": "^22.7.5",
     "@types/react": "18.3.13",
     "@types/react-dom": "18.3.1",
-    "@vaadin/hilla-generator-cli": "24.6.0",
-    "@vaadin/hilla-generator-core": "24.6.0",
-    "@vaadin/hilla-generator-plugin-backbone": "24.6.0",
-    "@vaadin/hilla-generator-plugin-barrel": "24.6.0",
-    "@vaadin/hilla-generator-plugin-client": "24.6.0",
-    "@vaadin/hilla-generator-plugin-model": "24.6.0",
-    "@vaadin/hilla-generator-plugin-push": "24.6.0",
-    "@vaadin/hilla-generator-plugin-signals": "24.6.0",
-    "@vaadin/hilla-generator-plugin-subtypes": "24.6.0",
-    "@vaadin/hilla-generator-utils": "24.6.0",
+    "@vaadin/hilla-generator-cli": "24.7.0-alpha3",
+    "@vaadin/hilla-generator-core": "24.7.0-alpha3",
+    "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha3",
+    "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha3",
+    "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha3",
+    "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha3",
+    "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha3",
+    "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha3",
+    "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha3",
+    "@vaadin/hilla-generator-utils": "24.7.0-alpha3",
     "@vitejs/plugin-react": "4.3.4",
     "async": "3.2.6",
     "commander": "^9.4.1",
@@ -114,7 +114,6 @@
     "@vaadin/hilla-react-crud": "$@vaadin/hilla-react-crud",
     "@vaadin/hilla-file-router": "$@vaadin/hilla-file-router",
     "construct-style-sheets-polyfill": "$construct-style-sheets-polyfill",
-    "react-router-dom": "$react-router-dom",
     "@vaadin/hilla-react-i18n": "$@vaadin/hilla-react-i18n",
     "lit": "$lit",
     "@polymer/polymer": "$@polymer/polymer",
@@ -135,7 +134,8 @@
     "@opentelemetry/sdk-trace-web": "$@opentelemetry/sdk-trace-web",
     "@opentelemetry/instrumentation-long-task": "$@opentelemetry/instrumentation-long-task",
     "@vaadin/vaadin-material-styles": "$@vaadin/vaadin-material-styles",
-    "@vaadin/router": "$@vaadin/router"
+    "@vaadin/router": "$@vaadin/router",
+    "react-router": "$react-router"
   },
   "private": true,
   "scripts": {
@@ -157,23 +157,23 @@
       "@opentelemetry/instrumentation-xml-http-request": "0.34.0",
       "@opentelemetry/sdk-trace-web": "1.8.0",
       "@polymer/polymer": "3.5.2",
-      "@vaadin/bundles": "24.6.0",
+      "@vaadin/bundles": "24.7.0-alpha2",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-file-router": "24.6.0",
-      "@vaadin/hilla-frontend": "24.6.0",
-      "@vaadin/hilla-lit-form": "24.6.0",
-      "@vaadin/hilla-react-auth": "24.6.0",
-      "@vaadin/hilla-react-crud": "24.6.0",
-      "@vaadin/hilla-react-form": "24.6.0",
-      "@vaadin/hilla-react-i18n": "24.6.0",
-      "@vaadin/hilla-react-signals": "24.6.0",
-      "@vaadin/polymer-legacy-adapter": "24.6.0",
-      "@vaadin/react-components": "24.6.0",
-      "@vaadin/react-components-pro": "24.6.0",
+      "@vaadin/hilla-file-router": "24.7.0-alpha3",
+      "@vaadin/hilla-frontend": "24.7.0-alpha3",
+      "@vaadin/hilla-lit-form": "24.7.0-alpha3",
+      "@vaadin/hilla-react-auth": "24.7.0-alpha3",
+      "@vaadin/hilla-react-crud": "24.7.0-alpha3",
+      "@vaadin/hilla-react-form": "24.7.0-alpha3",
+      "@vaadin/hilla-react-i18n": "24.7.0-alpha3",
+      "@vaadin/hilla-react-signals": "24.7.0-alpha3",
+      "@vaadin/polymer-legacy-adapter": "24.7.0-alpha2",
+      "@vaadin/react-components": "24.7.0-alpha2",
+      "@vaadin/react-components-pro": "24.7.0-alpha2",
       "@vaadin/vaadin-development-mode-detector": "2.0.7",
-      "@vaadin/vaadin-lumo-styles": "24.6.0",
-      "@vaadin/vaadin-material-styles": "24.6.0",
-      "@vaadin/vaadin-themable-mixin": "24.6.0",
+      "@vaadin/vaadin-lumo-styles": "24.7.0-alpha2",
+      "@vaadin/vaadin-material-styles": "24.7.0-alpha2",
+      "@vaadin/vaadin-themable-mixin": "24.7.0-alpha2",
       "@vaadin/vaadin-usage-statistics": "2.1.3",
       "construct-style-sheets-polyfill": "3.1.0",
       "date-fns": "2.29.3",
@@ -182,7 +182,7 @@
       "react": "18.3.1",
       "react-colorful": "5.6.1",
       "react-dom": "18.3.1",
-      "react-router-dom": "6.28.0"
+      "react-router": "7.0.2"
     },
     "devDependencies": {
       "@babel/preset-react": "7.26.3",
@@ -191,16 +191,16 @@
       "@rollup/pluginutils": "5.1.3",
       "@types/react": "18.3.13",
       "@types/react-dom": "18.3.1",
-      "@vaadin/hilla-generator-cli": "24.6.0",
-      "@vaadin/hilla-generator-core": "24.6.0",
-      "@vaadin/hilla-generator-plugin-backbone": "24.6.0",
-      "@vaadin/hilla-generator-plugin-barrel": "24.6.0",
-      "@vaadin/hilla-generator-plugin-client": "24.6.0",
-      "@vaadin/hilla-generator-plugin-model": "24.6.0",
-      "@vaadin/hilla-generator-plugin-push": "24.6.0",
-      "@vaadin/hilla-generator-plugin-signals": "24.6.0",
-      "@vaadin/hilla-generator-plugin-subtypes": "24.6.0",
-      "@vaadin/hilla-generator-utils": "24.6.0",
+      "@vaadin/hilla-generator-cli": "24.7.0-alpha3",
+      "@vaadin/hilla-generator-core": "24.7.0-alpha3",
+      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha3",
+      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha3",
+      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha3",
+      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha3",
+      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha3",
+      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha3",
+      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha3",
+      "@vaadin/hilla-generator-utils": "24.7.0-alpha3",
       "@vitejs/plugin-react": "4.3.4",
       "async": "3.2.6",
       "glob": "10.4.5",
@@ -215,6 +215,6 @@
       "workbox-core": "7.3.0",
       "workbox-precaching": "7.3.0"
     },
-    "hash": "bf69e9023a684274143e569b43288b74baef6fe4935f5c7b8bec7146ad3a4511"
+    "hash": "c15f588e4b0c00835439ecbfe8bdee052bc77e6009fda48579e9253cc167b073"
   }
 }
diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <!-- tag::vaadin-version[] -->
-        <vaadin.version>24.6.0</vaadin.version>
+        <vaadin.version>24.7.0.alpha1</vaadin.version>
         <!-- end::vaadin-version[] -->
 
         <drivers.dir>${project.basedir}/drivers</drivers.dir>

diff --git a/src/main/bundles/prod.bundle b/src/main/bundles/prod.bundle