fix express types

Author: lobsterkatie

packages/node/package.json

@@ -27,7 +27,7 @@
   },
   "devDependencies": {
     "@types/cookie": "0.3.2",
-    "@types/express": "^4.17.2",
+    "@types/express": "^4.17.14",
     "@types/lru-cache": "^5.1.0",
     "@types/node": "~10.17.0",
     "express": "^4.17.1",

packages/remix/package.json

@@ -35,6 +35,7 @@
   "devDependencies": {
     "@remix-run/node": "^1.4.3",
     "@remix-run/react": "^1.4.3",
+    "@types/express": "^4.17.14",
     "portfinder": "^1.0.28"
   },
   "peerDependencies": {

packages/remix/src/utils/types.ts

@@ -3,6 +3,7 @@
 // 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 * as http from 'http';
 import type { ComponentType } from 'react';
 
 export type AppLoadContext = any;
@@ -14,8 +15,11 @@ export type Params<Key extends string = string> = {
   readonly [key in Key]: string | undefined;
 };
 
-export type ExpressRequest = Express.Request;
-export type ExpressResponse = Express.Response;
+// In theory, the `Request` and `Response` types from express are extensions of the `http` types but in practice... not
+// so much. See https://github.com/DefinitelyTyped/DefinitelyTyped/issues/40138, which is closed but apparently not
+// actually solved.
+export type ExpressRequest = Express.Request & http.IncomingMessage;
+export type ExpressResponse = Express.Response & http.ServerResponse;
 export type ExpressNextFunction = Express.NextFunction;
 
 export interface Route {

packages/serverless/package.json

@@ -21,7 +21,7 @@
     "@sentry/types": "7.13.0",
     "@sentry/utils": "7.13.0",
     "@types/aws-lambda": "^8.10.62",
-    "@types/express": "^4.17.2",
+    "@types/express": "^4.17.14",
     "tslib": "^1.9.3"
   },
   "devDependencies": {

packages/tracing/package.json

@@ -23,7 +23,7 @@
   },
   "devDependencies": {
     "@sentry/browser": "7.13.0",
-    "@types/express": "^4.17.1"
+    "@types/express": "^4.17.14"
   },
   "scripts": {
     "build": "run-p build:rollup build:types build:bundle && yarn build:extras #necessary for integration tests",

yarn.lock

@@ -5112,9 +5112,9 @@
     "@types/range-parser" "*"
 
 "@types/express-serve-static-core@^4.17.18":
-  version "4.17.19"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz#00acfc1632e729acac4f1530e9e16f6dd1508a1d"
-  integrity sha512-DJOSHzX7pCiSElWaGR8kCprwibCB/3yW6vcT8VG3P0SJjnv19gnWG/AZMfM60Xj/YJIp/YCaDHyvzsFVeniARA==
+  version "4.17.31"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz#a1139efeab4e7323834bb0226e62ac019f474b2f"
+  integrity sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==
   dependencies:
     "@types/node" "*"
     "@types/qs" "*"
@@ -5130,10 +5130,10 @@
     "@types/qs" "*"
     "@types/serve-static" "*"
 
-"@types/express@^4.17.1", "@types/express@^4.17.2":
-  version "4.17.11"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.11.tgz#debe3caa6f8e5fcda96b47bd54e2f40c4ee59545"
-  integrity sha512-no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg==
+"@types/express@^4.17.14", "@types/express@^4.17.2":
+  version "4.17.14"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.14.tgz#143ea0557249bc1b3b54f15db4c81c3d4eb3569c"
+  integrity sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "^4.17.18"