Merge branch 'main' into taefi/bump-remaining-24.6-to-24.7

vaadin · Dec 9, 2024 · 0493cbe · 0493cbe
2 parents ee44ae9 + d9a8bad
commit 0493cbe
Show file tree

Hide file tree

Showing 29 changed files with 79 additions and 117 deletions.
diff --git a/package-lock.json b/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/src/main/frontend/App.tsx b/packages/java/tests/gradle/single-module/src/main/frontend/App.tsx
@@ -1,5 +1,5 @@
 import router from './routes';
-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/src/main/frontend/_views/MainLayout.tsx b/packages/java/tests/gradle/single-module/src/main/frontend/_views/MainLayout.tsx
@@ -5,7 +5,7 @@ import { Scroller } from '@vaadin/react-components/Scroller.js';
 import Placeholder from '../components/placeholder/Placeholder';
 import { MenuProps, routes, useViewMatches, ViewRouteObject } from '../routes';
 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/src/main/frontend/routes.tsx b/packages/java/tests/gradle/single-module/src/main/frontend/routes.tsx
@@ -1,7 +1,7 @@
 import HelloReactView from './_views/helloreact/HelloReactView';
 import MainLayout from './_views/MainLayout';
 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'));
 export type MenuProps = Readonly<{

diff --git a/packages/java/tests/spring/native/frontend/App.tsx b/packages/java/tests/spring/native/frontend/App.tsx
@@ -1,6 +1,6 @@
 import router from 'Frontend/routes.js';
 import { AuthContext, useAuth } from 'Frontend/useAuth.js';
-import { RouterProvider } from 'react-router-dom';
+import { RouterProvider } from 'react-router';
 
 export default function App() {
   const auth = useAuth();

diff --git a/packages/java/tests/spring/native/frontend/routes.tsx b/packages/java/tests/spring/native/frontend/routes.tsx
@@ -1,4 +1,4 @@
-import {createBrowserRouter, RouteObject} from 'react-router-dom';
+import {createBrowserRouter, RouteObject} from 'react-router';
 import {ChatView} from "Frontend/views/ChatView.js";
 import {LoginView} from "Frontend/views/LoginView.js";
 import {ReadOnlyGrid} from "Frontend/views/ReadOnlyGrid";

diff --git a/packages/java/tests/spring/native/frontend/util/routing.ts b/packages/java/tests/spring/native/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/packages/java/tests/spring/native/frontend/views/AuthControl.tsx b/packages/java/tests/spring/native/frontend/views/AuthControl.tsx
@@ -1,6 +1,6 @@
 import { AccessProps, AuthContext } from 'Frontend/useAuth.js';
 import { ReactNode, useContext } from 'react';
-import { Navigate, useMatches } from 'react-router-dom';
+import { Navigate, useMatches } from 'react-router';
 
 export type AuthControlProps = Readonly<{
   fallback?: ReactNode;

diff --git a/packages/java/tests/spring/native/frontend/views/MainLayout.tsx b/packages/java/tests/spring/native/frontend/views/MainLayout.tsx
@@ -7,7 +7,7 @@ import Placeholder from 'Frontend/components/placeholder/Placeholder';
 import { AuthContext } from 'Frontend/useAuth.js';
 import { useRouteMetadata } from 'Frontend/util/routing';
 import { Suspense, useContext } from 'react';
-import { NavLink, Outlet } from 'react-router-dom';
+import { NavLink, Outlet } from 'react-router';
 
 const navLinkClasses = ({ isActive }: any) => {
   return `block rounded-m p-s ${isActive ? 'bg-primary-10 text-primary' : 'text-body'}`;

diff --git a/packages/java/tests/spring/react-grid-test/frontend/App.tsx b/packages/java/tests/spring/react-grid-test/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/spring/react-grid-test/frontend/MainLayout.tsx b/packages/java/tests/spring/react-grid-test/frontend/MainLayout.tsx
@@ -2,7 +2,7 @@ import { AppLayout } from '@vaadin/react-components/AppLayout.js';
 import { DrawerToggle } from '@vaadin/react-components/DrawerToggle.js';
 import { Scroller } from '@vaadin/react-components/Scroller.js';
 import { routes } from 'Frontend/routes.js';
-import { NavLink, Outlet } from 'react-router-dom';
+import { NavLink, Outlet } from 'react-router';
 
 export default function MainLayout() {
   const menuRoutes = routes[0]!.children;

diff --git a/packages/java/tests/spring/react-grid-test/frontend/routes.tsx b/packages/java/tests/spring/react-grid-test/frontend/routes.tsx
@@ -1,4 +1,4 @@
-import { createBrowserRouter } from 'react-router-dom';
+import { createBrowserRouter } from 'react-router';
 import MainLayout from './MainLayout.js';
 import { AutoCrudView } from 'Frontend/views/AutoCrudView.js';
 import { AutoFormView } from 'Frontend/views/AutoFormView.js';

diff --git a/packages/java/tests/spring/react-i18n/frontend/App.tsx b/packages/java/tests/spring/react-i18n/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/spring/react-i18n/frontend/MainLayout.tsx b/packages/java/tests/spring/react-i18n/frontend/MainLayout.tsx
@@ -2,7 +2,7 @@ import { AppLayout } from '@vaadin/react-components/AppLayout.js';
 import { DrawerToggle } from '@vaadin/react-components/DrawerToggle.js';
 import { Scroller } from '@vaadin/react-components/Scroller.js';
 import { routes } from 'Frontend/routes.js';
-import { NavLink, Outlet } from 'react-router-dom';
+import { NavLink, Outlet } from 'react-router';
 
 export default function MainLayout() {
   const menuRoutes = routes[0]!.children;

diff --git a/packages/java/tests/spring/react-i18n/frontend/routes.tsx b/packages/java/tests/spring/react-i18n/frontend/routes.tsx
@@ -1,4 +1,4 @@
-import { createBrowserRouter } from 'react-router-dom';
+import { createBrowserRouter } from 'react-router';
 import MainLayout from './MainLayout.js';
 import BasicI18NView from './_views/BasicI18NView';
 export const routes = [

diff --git a/packages/java/tests/spring/react-signals/frontend/index.tsx b/packages/java/tests/spring/react-signals/frontend/index.tsx
@@ -12,7 +12,7 @@
 
 import { createElement } from 'react';
 import { createRoot } from 'react-dom/client';
-import { RouterProvider } from 'react-router-dom';
+import { RouterProvider } from 'react-router';
 import { router } from 'Frontend/generated/routes.js';
 import { AuthProvider } from 'Frontend/util/auth';
 

diff --git a/packages/java/tests/spring/react-signals/frontend/views/SharedSignalSecurity.tsx b/packages/java/tests/spring/react-signals/frontend/views/SharedSignalSecurity.tsx
@@ -2,7 +2,7 @@ import { Button } from '@vaadin/react-components';
 import { useSignal } from '@vaadin/hilla-react-signals';
 import { SecureNumberSignalService } from 'Frontend/generated/endpoints.js';
 import { useAuth } from 'Frontend/util/auth.js';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate } from 'react-router';
 
 const userCounter = SecureNumberSignalService.userCounter();
 const adminCounter = SecureNumberSignalService.adminCounter();

diff --git a/packages/ts/file-router/package.json b/packages/ts/file-router/package.json
@@ -59,7 +59,7 @@
   "peerDependencies": {
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-router-dom": "^6.28.0"
+    "react-router": "^7"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4-fix.0",

diff --git a/packages/ts/file-router/src/runtime/RouterConfigurationBuilder.ts b/packages/ts/file-router/src/runtime/RouterConfigurationBuilder.ts
@@ -1,12 +1,7 @@
 /* eslint-disable @typescript-eslint/consistent-type-assertions */
 import { protectRoute } from '@vaadin/hilla-react-auth';
 import { type ComponentType, createElement } from 'react';
-import {
-  createBrowserRouter,
-  type IndexRouteObject,
-  type NonIndexRouteObject,
-  type RouteObject,
-} from 'react-router-dom';
+import { createBrowserRouter, type IndexRouteObject, type NonIndexRouteObject, type RouteObject } from 'react-router';
 import { convertComponentNameToTitle } from '../shared/convertComponentNameToTitle.js';
 import { transformTree } from '../shared/transformTree.js';
 import type {
@@ -358,22 +353,7 @@ export class RouterConfigurationBuilder {
 
     return {
       routes,
-      router: createBrowserRouter([...routes], {
-        basename: new URL(document.baseURI).pathname,
-        future: {
-          // eslint-disable-next-line camelcase
-          v7_fetcherPersist: true,
-          // eslint-disable-next-line camelcase
-          v7_normalizeFormMethod: true,
-          // eslint-disable-next-line camelcase
-          v7_partialHydration: true,
-          // eslint-disable-next-line camelcase
-          v7_relativeSplatPath: true,
-          // eslint-disable-next-line camelcase
-          v7_skipActionErrorRevalidation: true,
-        },
-        ...options,
-      }),
+      router: createBrowserRouter([...routes], { basename: new URL(document.baseURI).pathname, ...options }),
     };
   }
 

diff --git a/packages/ts/file-router/src/runtime/useViewConfig.ts b/packages/ts/file-router/src/runtime/useViewConfig.ts
@@ -1,5 +1,5 @@
-import type { UIMatch } from '@remix-run/router';
-import { useMatches } from 'react-router-dom';
+import type { UIMatch } from 'react-router';
+import { useMatches } from 'react-router';
 import type { ViewConfig } from '../types.js';
 
 /**

diff --git a/packages/ts/file-router/src/types.d.ts b/packages/ts/file-router/src/types.d.ts
@@ -1,4 +1,4 @@
-import type { createBrowserRouter, RouteObject } from 'react-router-dom';
+import type { createBrowserRouter, RouteObject } from 'react-router';
 
 export type ViewConfig = Readonly<{
   /**

diff --git a/packages/ts/file-router/test/mocks/react-router-dom.ts b/packages/ts/file-router/test/mocks/react-router-dom.ts