From a82319dea94a7bdbd4f99dd148b38dfe6b8367c0 Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Mon, 22 Jul 2024 12:23:02 +0200 Subject: [PATCH] RSC: Fix RscRouter import order (#11048) --- __fixtures__/test-project-rsa/web/src/Routes.tsx | 3 +-- __fixtures__/test-project-rsc-kitchen-sink/web/src/Routes.tsx | 2 +- .../commands/experimental/templates/rsc/Routes.tsx.template | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/__fixtures__/test-project-rsa/web/src/Routes.tsx b/__fixtures__/test-project-rsa/web/src/Routes.tsx index 8fb9dd5e3c86..b988f8fb6275 100644 --- a/__fixtures__/test-project-rsa/web/src/Routes.tsx +++ b/__fixtures__/test-project-rsa/web/src/Routes.tsx @@ -8,9 +8,8 @@ // 'src/pages/Admin/BooksPage/BooksPage.js' -> AdminBooksPage import { Route } from '@redwoodjs/router/Route' -import { Set } from '@redwoodjs/router/Set' - import { Router } from '@redwoodjs/router/RscRouter' +import { Set } from '@redwoodjs/router/Set' import NavigationLayout from './layouts/NavigationLayout/NavigationLayout' import NotFoundPage from './pages/NotFoundPage/NotFoundPage' diff --git a/__fixtures__/test-project-rsc-kitchen-sink/web/src/Routes.tsx b/__fixtures__/test-project-rsc-kitchen-sink/web/src/Routes.tsx index 4c79aecaeeeb..d729a67243a1 100644 --- a/__fixtures__/test-project-rsc-kitchen-sink/web/src/Routes.tsx +++ b/__fixtures__/test-project-rsc-kitchen-sink/web/src/Routes.tsx @@ -8,8 +8,8 @@ // 'src/pages/Admin/BooksPage/BooksPage.js' -> AdminBooksPage import { Route } from '@redwoodjs/router/Route' -import { Set, PrivateSet } from '@redwoodjs/router/Set' import { Router } from '@redwoodjs/router/RscRouter' +import { Set, PrivateSet } from '@redwoodjs/router/Set' import { useAuth } from './auth' import AuthLayout from './layouts/AuthLayout/AuthLayout' diff --git a/packages/cli/src/commands/experimental/templates/rsc/Routes.tsx.template b/packages/cli/src/commands/experimental/templates/rsc/Routes.tsx.template index a4eddb3762b7..9c1fba89c5e7 100644 --- a/packages/cli/src/commands/experimental/templates/rsc/Routes.tsx.template +++ b/packages/cli/src/commands/experimental/templates/rsc/Routes.tsx.template @@ -8,9 +8,8 @@ // 'src/pages/Admin/BooksPage/BooksPage.js' -> AdminBooksPage import { Route } from '@redwoodjs/router/Route' -import { Set } from '@redwoodjs/router/Set' - import { Router } from '@redwoodjs/router/RscRouter' +import { Set } from '@redwoodjs/router/Set' import NavigationLayout from 'src/layouts/NavigationLayout' import NotFoundPage from 'src/pages/NotFoundPage'