Skip to content

Commit fccd2b4

Browse files
ScriptedAlchemyScriptedAlchemy
committed
chore: fix ssr in rr7.3
1 parent 78027d8 commit fccd2b4

35 files changed

+151
-112
lines changed

‎examples/federation/epic-stack-remote/rsbuild.config.ts‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,17 @@ export default defineConfig({
7474
'./components/floating-toolbar': './app/components/floating-toolbar',
7575
'./components/forms': './app/components/forms',
7676
'./components/progress-bar': './app/components/progress-bar',
77+
'./components/ui/tooltip': './app/components/ui/tooltip',
78+
'./components/ui/status-button': './app/components/ui/status-button',
79+
'./components/ui/textarea': './app/components/ui/textarea',
80+
'./components/ui/sonner': './app/components/ui/sonner',
81+
'./components/ui/label': './app/components/ui/label',
82+
'./components/ui/input': './app/components/ui/input',
83+
'./components/ui/input-otp': './app/components/ui/input-otp',
84+
'./components/ui/dropdown-menu': './app/components/ui/dropdown-menu',
85+
'./components/ui/icon': './app/components/ui/icon',
86+
'./components/ui/button': './app/components/ui/button',
87+
'./components/ui/checkbox': './app/components/ui/checkbox',
7788
},
7889
shared: {
7990
'react-router': {
@@ -124,7 +135,17 @@ export default defineConfig({
124135
'./components/floating-toolbar': './app/components/floating-toolbar',
125136
'./components/forms': './app/components/forms',
126137
'./components/progress-bar': './app/components/progress-bar',
127-
138+
'./components/ui/tooltip': './app/components/ui/tooltip',
139+
'./components/ui/status-button': './app/components/ui/status-button',
140+
'./components/ui/textarea': './app/components/ui/textarea',
141+
'./components/ui/sonner': './app/components/ui/sonner',
142+
'./components/ui/label': './app/components/ui/label',
143+
'./components/ui/input': './app/components/ui/input',
144+
'./components/ui/input-otp': './app/components/ui/input-otp',
145+
'./components/ui/dropdown-menu': './app/components/ui/dropdown-menu',
146+
'./components/ui/icon': './app/components/ui/icon',
147+
'./components/ui/button': './app/components/ui/button',
148+
'./components/ui/checkbox': './app/components/ui/checkbox',
128149
},
129150
shared: {
130151
'react-router': {

‎examples/federation/epic-stack/app/components/search-bar.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { useId } from 'react'
2-
import { Form, useSearchParams, useSubmit } from 'react-router'
2+
import { Form as ReactRouterForm, useSearchParams, useSubmit } from 'react-router'
3+
import { Form } from 'remote/components/forms'
34
import { useDebounce, useIsPending } from '#app/utils/misc.tsx'
45
import { Icon } from './ui/icon.tsx'
56
import { Input } from './ui/input.tsx'

‎examples/federation/epic-stack/app/components/user-dropdown.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { useRef } from 'react'
2-
import { Link, Form } from 'react-router'
2+
import { Link, Form as ReactRouterForm } from 'react-router'
3+
import { Form } from 'remote/components/forms'
34
import { getUserImgSrc } from '#app/utils/misc.tsx'
45
import { useUser } from '#app/utils/user.ts'
56
import { Button } from './ui/button'

‎examples/federation/epic-stack/app/root.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ import { HoneypotProvider } from 'remix-utils/honeypot/react'
1313
import { type Route } from './+types/root.ts'
1414
import appleTouchIconAssetUrl from './assets/favicons/apple-touch-icon.png'
1515
import faviconAssetUrl from './assets/favicons/favicon.svg'
16-
import { GeneralErrorBoundary } from './components/error-boundary.tsx'
17-
import { EpicProgress } from './components/progress-bar.tsx'
16+
import { GeneralErrorBoundary } from 'remote/components/error-boundary'
17+
import { EpicProgress } from 'remote/components/progress-bar'
1818
import { SearchBar } from 'remote/components/search-bar'
19-
import { useToast } from './components/toaster.tsx'
19+
import { useToast } from 'remote/components/toaster'
2020
import { Button } from './components/ui/button.tsx'
2121
import { href as iconsHref } from './components/ui/icon.tsx'
2222
import { EpicToaster } from './components/ui/sonner.tsx'
23-
import { UserDropdown } from './components/user-dropdown.tsx'
23+
import { UserDropdown } from 'remote/components/user-dropdown'
2424
import {
2525
ThemeSwitch,
2626
useOptionalTheme,

‎examples/federation/epic-stack/app/routes/$.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
// message for them than the Remix and/or browser default.
77

88
import { Link, useLocation } from 'react-router'
9-
import { GeneralErrorBoundary } from '#app/components/error-boundary.tsx'
10-
import { Icon } from '#app/components/ui/icon.tsx'
9+
import { GeneralErrorBoundary } from 'remote/components/error-boundary'
10+
import { Icon } from 'remote/components/ui/icon'
1111

1212
export function loader() {
1313
throw new Response('Not found', { status: 404 })

‎examples/federation/epic-stack/app/routes/_auth+/forgot-password.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import * as E from '@react-email/components'
55
import { data, redirect, Link, useFetcher } from 'react-router'
66
import { HoneypotInputs } from 'remix-utils/honeypot/react'
77
import { z } from 'zod'
8-
import { GeneralErrorBoundary } from '#app/components/error-boundary.tsx'
9-
import { ErrorList, Field } from '#app/components/forms.tsx'
10-
import { StatusButton } from '#app/components/ui/status-button.tsx'
8+
import { GeneralErrorBoundary } from 'remote/components/error-boundary'
9+
import { ErrorList, Field } from 'remote/components/forms'
10+
import { StatusButton } from 'remote/components/ui/status-button'
1111
import { prisma } from '#app/utils/db.server.ts'
1212
import { sendEmail } from '#app/utils/email.server.ts'
1313
import { checkHoneypot } from '#app/utils/honeypot.server.ts'

‎examples/federation/epic-stack/app/routes/_auth+/login.tsx‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import { getFormProps, getInputProps, useForm } from '@conform-to/react'
22
import { getZodConstraint, parseWithZod } from '@conform-to/zod'
33
import { type SEOHandle } from '@nasa-gcn/remix-seo'
4-
import { data, Form, Link, useSearchParams } from 'react-router'
4+
import { data, Form as ReactRouterForm, Link, useSearchParams } from 'react-router'
5+
import { Form } from 'remote/components/forms'
56
import { HoneypotInputs } from 'remix-utils/honeypot/react'
67
import { z } from 'zod'
7-
import { GeneralErrorBoundary } from '#app/components/error-boundary.tsx'
8-
import { CheckboxField, ErrorList, Field } from '#app/components/forms.tsx'
9-
import { Spacer } from '#app/components/spacer.tsx'
10-
import { StatusButton } from '#app/components/ui/status-button.tsx'
8+
import { GeneralErrorBoundary } from 'remote/components/error-boundary'
9+
import { CheckboxField, ErrorList, Field } from 'remote/components/forms'
10+
import { Spacer } from 'remote/components/spacer'
11+
import { StatusButton } from 'remote/components/ui/status-button'
1112
import { login, requireAnonymous } from '#app/utils/auth.server.ts'
1213
import {
1314
ProviderConnectionForm,

‎examples/federation/epic-stack/app/routes/_auth+/onboarding.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import { data, redirect, Form, useSearchParams } from 'react-router'
44
import { HoneypotInputs } from 'remix-utils/honeypot/react'
55
import { safeRedirect } from 'remix-utils/safe-redirect'
66
import { z } from 'zod'
7-
import { CheckboxField, ErrorList, Field } from '#app/components/forms.tsx'
8-
import { Spacer } from '#app/components/spacer.tsx'
9-
import { StatusButton } from '#app/components/ui/status-button.tsx'
7+
import { CheckboxField, ErrorList, Field } from 'remote/components/forms'
8+
import { Spacer } from 'remote/components/spacer'
9+
import { StatusButton } from 'remote/components/ui/status-button'
1010
import { requireAnonymous, sessionKey, signup } from '#app/utils/auth.server.ts'
1111
import { prisma } from '#app/utils/db.server.ts'
1212
import { checkHoneypot } from '#app/utils/honeypot.server.ts'

‎examples/federation/epic-stack/app/routes/_auth+/onboarding_.$provider.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import {
1414
} from 'react-router'
1515
import { safeRedirect } from 'remix-utils/safe-redirect'
1616
import { z } from 'zod'
17-
import { CheckboxField, ErrorList, Field } from '#app/components/forms.tsx'
18-
import { Spacer } from '#app/components/spacer.tsx'
19-
import { StatusButton } from '#app/components/ui/status-button.tsx'
17+
import { CheckboxField, ErrorList, Field } from 'remote/components/forms'
18+
import { Spacer } from 'remote/components/spacer'
19+
import { StatusButton } from 'remote/components/ui/status-button'
2020
import {
2121
authenticator,
2222
sessionKey,

‎examples/federation/epic-stack/app/routes/_auth+/reset-password.tsx‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import { getFormProps, getInputProps, useForm } from '@conform-to/react'
22
import { getZodConstraint, parseWithZod } from '@conform-to/zod'
33
import { type SEOHandle } from '@nasa-gcn/remix-seo'
4-
import { data, redirect, Form } from 'react-router'
5-
import { GeneralErrorBoundary } from '#app/components/error-boundary.tsx'
6-
import { ErrorList, Field } from '#app/components/forms.tsx'
7-
import { StatusButton } from '#app/components/ui/status-button.tsx'
4+
import { data, redirect, Form as ReactRouterForm } from 'react-router'
5+
import { Form } from 'remote/components/forms'
6+
import { GeneralErrorBoundary } from 'remote/components/error-boundary'
7+
import { ErrorList, Field } from 'remote/components/forms'
8+
import { StatusButton } from 'remote/components/ui/status-button'
89
import { requireAnonymous, resetUserPassword } from '#app/utils/auth.server.ts'
910
import { useIsPending } from '#app/utils/misc.tsx'
1011
import { PasswordAndConfirmPasswordSchema } from '#app/utils/user-validation.ts'

0 commit comments

Comments
 (0)