upgrade to latest remix-utils

oskarunt · Oct 12, 2023 · 605c029 · 605c029
1 parent 944917b
commit 605c029
Show file tree

Hide file tree

Showing 10 changed files with 57 additions and 342 deletions.
diff --git a/app/components/confetti.tsx b/app/components/confetti.tsx
@@ -1,5 +1,5 @@
 import { Index as ConfettiShower } from 'confetti-react'
-import { ClientOnly } from 'remix-utils'
+import { ClientOnly } from 'remix-utils/client-only'
 
 export function Confetti({ id }: { id?: string | null }) {
 	if (!id) return null

diff --git a/app/routes/_auth+/login.tsx b/app/routes/_auth+/login.tsx
@@ -7,7 +7,7 @@ import {
 	type MetaFunction,
 } from '@remix-run/node'
 import { Form, Link, useActionData, useSearchParams } from '@remix-run/react'
-import { safeRedirect } from 'remix-utils'
+import { safeRedirect } from 'remix-utils/safe-redirect'
 import { z } from 'zod'
 import { GeneralErrorBoundary } from '#app/components/error-boundary.tsx'
 import { CheckboxField, ErrorList, Field } from '#app/components/forms.tsx'

diff --git a/app/routes/_auth+/onboarding.tsx b/app/routes/_auth+/onboarding.tsx
@@ -12,7 +12,7 @@ import {
 	useLoaderData,
 	useSearchParams,
 } from '@remix-run/react'
-import { safeRedirect } from 'remix-utils'
+import { safeRedirect } from 'remix-utils/safe-redirect'
 import { z } from 'zod'
 import { CheckboxField, ErrorList, Field } from '#app/components/forms.tsx'
 import { Spacer } from '#app/components/spacer.tsx'

diff --git a/app/routes/_auth+/onboarding_.$provider.tsx b/app/routes/_auth+/onboarding_.$provider.tsx
@@ -13,7 +13,7 @@ import {
 	useSearchParams,
 	type Params,
 } from '@remix-run/react'
-import { safeRedirect } from 'remix-utils'
+import { safeRedirect } from 'remix-utils/safe-redirect'
 import { z } from 'zod'
 import { CheckboxField, ErrorList, Field } from '#app/components/forms.tsx'
 import { Spacer } from '#app/components/spacer.tsx'

diff --git a/app/utils/auth.server.ts b/app/utils/auth.server.ts
@@ -2,7 +2,7 @@ import { type Connection, type Password, type User } from '@prisma/client'
 import { redirect } from '@remix-run/node'
 import bcrypt from 'bcryptjs'
 import { Authenticator } from 'remix-auth'
-import { safeRedirect } from 'remix-utils'
+import { safeRedirect } from 'remix-utils/safe-redirect'
 import { connectionSessionStorage, providers } from './connections.server.ts'
 import { prisma } from './db.server.ts'
 import { combineHeaders, downloadFile } from './misc.tsx'

diff --git a/other/Dockerfile b/other/Dockerfile
@@ -15,7 +15,6 @@ FROM base as deps
 WORKDIR /myapp
 
 ADD package.json package-lock.json .npmrc ./
-ADD ./other/patches ./other/patches
 RUN npm install --include=dev
 
 # Setup production node_modules

diff --git a/other/patches/remix-utils+6.6.0.patch b/other/patches/remix-utils+6.6.0.patch