Revert "chore: use fastify types"

This reverts commit ebcf709.
getsentry · Apr 10, 2024 · 5245b4f · 5245b4f
1 parent ebcf709
commit 5245b4f
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 326 deletions.
diff --git a/packages/remix/package.json b/packages/remix/package.json
@@ -70,9 +70,7 @@
   "devDependencies": {
     "@remix-run/node": "^1.4.3",
     "@remix-run/react": "^1.4.3",
-    "@types/express": "^4.17.14",
-    "fastify": "^4.26.2",
-    "typescript": "^5.4.4"
+    "@types/express": "^4.17.14"
   },
   "peerDependencies": {
     "@remix-run/node": "1.x || 2.x",

diff --git a/packages/remix/src/utils/serverAdapters/express.ts b/packages/remix/src/utils/serverAdapters/express.ts
@@ -1,7 +1,6 @@
-import { type ExpressCreateHandlerWrapper } from '../vendor/types';
 import { SupportedFramework, prepareWrapCreateRequestHandler } from './shared';
 
 /**
  * Instruments `createRequestHandler` from `@remix-run/express`
  */
-export const wrapExpressCreateRequestHandler = prepareWrapCreateRequestHandler(SupportedFramework.Express) as ExpressCreateHandlerWrapper;
+export const wrapExpressCreateRequestHandler = prepareWrapCreateRequestHandler(SupportedFramework.Express);
diff --git a/packages/remix/src/utils/serverAdapters/fastify.ts b/packages/remix/src/utils/serverAdapters/fastify.ts
@@ -1,7 +1,6 @@
-import { type FastifyCreateHandlerWrapper } from '../vendor/types';
 import { SupportedFramework, prepareWrapCreateRequestHandler } from './shared';
 
 /**
  * Instruments `createRequestHandler` from `@mcansh/remix-fastify`
  */
-export const wrapFastifyCreateRequestHandler = prepareWrapCreateRequestHandler(SupportedFramework.Fastify) as FastifyCreateHandlerWrapper;
+export const wrapFastifyCreateRequestHandler = prepareWrapCreateRequestHandler(SupportedFramework.Fastify);
diff --git a/packages/remix/src/utils/vendor/types.ts b/packages/remix/src/utils/vendor/types.ts
@@ -15,8 +15,6 @@ import type { PolymorphicRequest } from '@sentry/types';
 import type * as Express from 'express';
 import type { ComponentType } from 'react';
 
-import type * as Fastify from 'fastify'
-
 type Dev = {
   command?: string;
   scheme?: string;
@@ -240,9 +238,8 @@ export interface AssetsManifest {
 }
 
 export type GenericRequestHandler = (req: any, res: any, next: any) => Promise<void>;
+
 export type CreateGenericRequestHandler = (this: unknown, options: any) => GenericRequestHandler;
-export type ExpressCreateHandlerWrapper = (createHandler: CreateGenericRequestHandler) => (opts: CreateRequestHandlerOptions) => Express.RequestHandler
-export type FastifyCreateHandlerWrapper = (createHandler: CreateGenericRequestHandler) => (opts: CreateRequestHandlerOptions) => Fastify.RouteHandlerMethod;
 
 export interface CreateRequestHandlerOptions {
   build: ServerBuild | (() => ServerBuild) | (() => Promise<ServerBuild>);

diff --git a/packages/remix/test/integration/test/server/utils/helpers.ts b/packages/remix/test/integration/test/server/utils/helpers.ts
@@ -31,11 +31,11 @@ const runExpressApp = (adapter: Adapter.Builtin | Adapter.Express): Promise<http
   }
 )
 
-const runFastifyApp = (): Promise<http.Server> => new Promise(async res => {
+const runFastifyApp = (): Promise<http.Server> => new Promise(res => {
   const app = fastify();
-  await app.register(formBody);
-  const handler = adapters[Adapter.Fastify]({ build: require('../../../build') });
-  app.all('*', handler);
+  app.register(formBody);
+  // @ts-ignore
+  app.all('*', adapters[Adapter.Fastify]({ build: require('../../../build') }));
   app.listen({port: 0}, (_err, _addr) => {
     res(app.server)
   });

diff --git a/packages/remix/tsconfig.json b/packages/remix/tsconfig.json
@@ -5,7 +5,6 @@
 
   "compilerOptions": {
     "jsx": "react",
-    "module": "es2020",
-    "ignoreDeprecations": "5.0"
+    "module": "es2020"
   }
 }