Resolve circular dependencies.

Author: onurtemizkan

packages/remix/src/utils/instrumentServer.ts

@@ -11,13 +11,13 @@ import {
   logger,
   serializeBaggage,
 } from '@sentry/utils';
-import type { Request as ExpressRequest } from 'express';
 
 import {
   AppData,
   CreateRequestHandlerFunction,
   DataFunction,
   DataFunctionArgs,
+  ExpressRequest,
   HandleDocumentRequestFunction,
   ReactRouterDomPkg,
   RequestHandler,

packages/remix/src/utils/serverAdapters/express.ts

@@ -1,16 +1,16 @@
 import { loadModule } from '@sentry/utils';
-import type * as Express from 'express';
 
 import { createRoutes, instrumentBuild, startRequestHandlerTransaction } from '../instrumentServer';
-import { ExpressCreateRequestHandler, ExpressRequestHandler, ReactRouterDomPkg, ServerBuild } from '../types';
-
-interface ExpressCreateRequestHandlerOptions {
-  build: ServerBuild;
-  getLoadContext?: GetLoadContextFunction;
-  mode?: string;
-}
-
-type GetLoadContextFunction = (req: any, res: any) => any;
+import {
+  ExpressCreateRequestHandler,
+  ExpressCreateRequestHandlerOptions,
+  ExpressNextFunction,
+  ExpressRequest,
+  ExpressRequestHandler,
+  ExpressResponse,
+  ReactRouterDomPkg,
+  ServerBuild,
+} from '../types';
 
 function wrapExpressRequestHandler(
   origRequestHandler: ExpressRequestHandler,
@@ -21,9 +21,9 @@ function wrapExpressRequestHandler(
 
   return async function (
     this: unknown,
-    req: Express.Request,
-    res: Express.Response,
-    next: Express.NextFunction,
+    req: ExpressRequest,
+    res: ExpressResponse,
+    next: ExpressNextFunction,
   ): Promise<void> {
     const transaction = startRequestHandlerTransaction(req, routes, pkg);
 

packages/remix/src/utils/types.ts

@@ -2,6 +2,7 @@
 /* eslint-disable @typescript-eslint/ban-types */
 // Types vendored from @remix-run/[email protected]:
 // https://github.com/remix-run/remix/blob/f3691d51027b93caa3fd2cdfe146d7b62a6eb8f2/packages/remix-server-runtime/server.ts
+import type * as Express from 'express';
 import type { ComponentType } from 'react';
 
 export type AppLoadContext = any;
@@ -13,6 +14,10 @@ export type Params<Key extends string = string> = {
   readonly [key in Key]: string | undefined;
 };
 
+export type ExpressRequest = Express.Request;
+export type ExpressResponse = Express.Response;
+export type ExpressNextFunction = Express.NextFunction;
+
 export interface Route {
   index?: boolean;
   caseSensitive?: boolean;
@@ -152,3 +157,11 @@ export interface AssetsManifest {
 export type ExpressRequestHandler = (req: any, res: any, next: any) => Promise<void>;
 
 export type ExpressCreateRequestHandler = (this: unknown, options: any) => ExpressRequestHandler;
+
+export interface ExpressCreateRequestHandlerOptions {
+  build: ServerBuild;
+  getLoadContext?: GetLoadContextFunction;
+  mode?: string;
+}
+
+type GetLoadContextFunction = (req: any, res: any) => any;