revert

utopia-remix/app/util/api.server.ts

@@ -8,7 +8,6 @@ import { getUserFromSession } from '../models/session.server'
 import * as cookie from 'cookie'
 import { Params } from '@remix-run/react'
 import { PrismaClientKnownRequestError } from 'prisma-client/runtime/library.js'
-import { AxiosResponse } from 'axios'
 
 interface ErrorResponse {
   error: string
@@ -114,15 +113,15 @@ export function ensure(condition: unknown, message: string, status: number): ass
   }
 }
 
-export async function proxiedResponse(response: AxiosResponse): Promise<unknown> {
+export async function proxiedResponse(response: Response): Promise<unknown> {
   if (response.status !== Status.OK) {
-    let text = await response.data
+    let text = await response.text()
     if (text.length === 0) {
       text = response.statusText
     }
     throw new ApiError(text, response.status)
   }
-  return response.data
+  return response.json()
 }
 
 export const SESSION_COOKIE_NAME = 'JSESSIONID'

utopia-remix/app/util/proxy.server.ts

@@ -2,7 +2,6 @@ import urljoin from 'url-join'
 import { ServerEnvironment } from '../env.server'
 import { proxiedResponse } from './api.server'
 import dns from 'dns'
-import axios, { AxiosHeaders } from 'axios'
 
 if (ServerEnvironment.environment === 'local') {
   // this is a workaround for default DNS resolution order with Node > 17 (where ipv6 comes first)
@@ -26,23 +25,15 @@ export async function proxy(req: Request, options?: { rawOutput?: boolean; path?
   const url = buildProxyUrl(new URL(req.url), options?.path ?? null)
 
   console.log(`proxying call to ${url}`)
-  const headers = new AxiosHeaders()
-  for (const [key, value] of req.headers) {
-    headers.set(key, value)
-  }
-
-  const data = await req.blob()
 
-  const resp = await axios.request({
-    url: url,
+  const response = await fetch(url, {
+    credentials: 'include',
     method: req.method,
-    headers: headers,
-    data: data,
-    withCredentials: true,
+    body: req.body,
+    headers: req.headers,
   })
-
   if (options?.rawOutput) {
-    return resp
+    return response
   }
-  return proxiedResponse(resp)
+  return proxiedResponse(response)
 }

utopia-remix/package.json

@@ -21,7 +21,6 @@
     "@remix-run/node": "2.5.1",
     "@remix-run/react": "2.5.1",
     "@remix-run/serve": "2.5.1",
-    "axios": "1.6.7",
     "cookie": "0.6.0",
     "dotenv": "16.4.1",
     "isbot": "4",