build: update @types/express and http-proxy-middleware

modules/builders/BUILD.bazel

@@ -26,7 +26,6 @@ ts_library(
         "@npm//@angular-devkit/architect",
         "@npm//@angular-devkit/core",
         "@npm//@types/browser-sync",
-        "@npm//@types/http-proxy-middleware",
         "@npm//browser-sync",
         "@npm//guess-parser",
         "@npm//http-proxy-middleware",

modules/builders/package.json

@@ -17,7 +17,7 @@
     "@angular-devkit/architect": "DEVKIT_ARCHITECT_VERSION",
     "@angular-devkit/core": "DEVKIT_CORE_VERSION",
     "browser-sync": "^2.26.7",
-    "http-proxy-middleware": "^0.20.0",
+    "http-proxy-middleware": "^1.0.0",
     "rxjs": "RXJS_VERSION",
     "tree-kill": "^1.2.1",
     "guess-parser": "^0.4.12"

modules/builders/src/ssr-dev-server/index.ts

@@ -14,7 +14,7 @@ import {
 } from '@angular-devkit/architect';
 import { json, logging, tags } from '@angular-devkit/core';
 import * as browserSync from 'browser-sync';
-import * as proxy from 'http-proxy-middleware';
+import { createProxyMiddleware } from 'http-proxy-middleware';
 import { join } from 'path';
 import {
   EMPTY,
@@ -266,7 +266,7 @@ async function initBrowserSync(
       // Remove leading slash
       bsOptions.scriptPath = p => p.substring(1),
       bsOptions.middleware = [
-        proxy(defaultSocketIoPath, {
+        createProxyMiddleware(defaultSocketIoPath, {
           target: url.format({
             protocol: 'http',
             hostname: host,
@@ -275,7 +275,7 @@ async function initBrowserSync(
           }),
           ws: true,
           logLevel: 'silent',
-        }),
+        }) as any,
       ];
     }
   }

modules/express-engine/tokens/BUILD.bazel

@@ -13,5 +13,6 @@ ng_module(
     deps = [
         "@npm//@angular/core",
         "@npm//@types/express",
+        "@npm//@types/express-serve-static-core",
     ],
 )

modules/express-engine/tokens/injection-tokens.ts

@@ -7,6 +7,7 @@
  */
 import { InjectionToken } from '@angular/core';
 import { Request, Response } from 'express';
+import { ParamsDictionary } from 'express-serve-static-core';
 
-export const REQUEST = new InjectionToken<Request>('REQUEST');
+export const REQUEST = new InjectionToken<Request<ParamsDictionary>>('REQUEST');
 export const RESPONSE = new InjectionToken<Response>('RESPONSE');

package.json

@@ -65,19 +65,19 @@
     "@hapi/hapi": "^18.4.0",
     "@schematics/angular": "^9.0.0",
     "@types/browser-sync": "^2.26.1",
-    "@types/express": "4.17.1",
+    "@types/express": "4.17.2",
+    "@types/express-serve-static-core": "4.17.2",
     "@types/fs-extra": "^8.0.0",
     "@types/hapi__hapi": "^19.0.0",
     "@types/hapi__inert": "^5.2.0",
-    "@types/http-proxy-middleware": "^0.19.3",
     "@types/jasmine": "^3.4.4",
     "@types/node": "^12.11.1",
     "@types/shelljs": "^0.8.6",
     "browser-sync": "^2.26.7",
     "domino": "^2.1.2",
     "express": "^4.15.2",
     "guess-parser": "^0.4.12",
-    "http-proxy-middleware": "^0.20.0",
+    "http-proxy-middleware": "^1.0.0",
     "jasmine-core": "^3.0.0",
     "karma": "^4.1.0",
     "karma-chrome-launcher": "^3.0.0",

yarn.lock

@@ -1513,10 +1513,18 @@
     "@types/node" "*"
     "@types/range-parser" "*"
 
-"@types/express@4.17.1":
-  version "4.17.1"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.1.tgz#4cf7849ae3b47125a567dfee18bfca4254b88c5c"
-  integrity sha512-VfH/XCP0QbQk5B5puLqTLEeFgR8lfCJHZJKkInZ9mkYd+u8byX0kztXEQxEk4wZXJs8HI+7km2ALXjn4YKcX9w==
+"@types/express-serve-static-core@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.2.tgz#f6f41fa35d42e79dbf6610eccbb2637e6008a0cf"
+  integrity sha512-El9yMpctM6tORDAiBwZVLMcxoTMcqqRO9dVyYcn7ycLWbvR8klrDn8CAOwRfZujZtWD7yS/mshTdz43jMOejbg==
+  dependencies:
+    "@types/node" "*"
+    "@types/range-parser" "*"
+
+"@types/express@4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.2.tgz#a0fb7a23d8855bac31bc01d5a58cadd9b2173e6c"
+  integrity sha512-5mHFNyavtLoJmnusB8OKJ5bshSzw+qkMIBAobLrIM48HJvunFva9mOa6aBwh64lBFyNwBbs0xiEFuj4eU/NjCA==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "*"
@@ -1600,16 +1608,7 @@
   dependencies:
     "@types/node" "*"
 
-"@types/http-proxy-middleware@^0.19.3":
-  version "0.19.3"
-  resolved "https://registry.yarnpkg.com/@types/http-proxy-middleware/-/http-proxy-middleware-0.19.3.tgz#b2eb96fbc0f9ac7250b5d9c4c53aade049497d03"
-  integrity sha512-lnBTx6HCOUeIJMLbI/LaL5EmdKLhczJY5oeXZpX/cXE4rRqb3RmV7VcMpiEfYkmTjipv3h7IAyIINe4plEv7cA==
-  dependencies:
-    "@types/connect" "*"
-    "@types/http-proxy" "*"
-    "@types/node" "*"
-
-"@types/http-proxy@*":
+"@types/http-proxy@^1.17.3":
   version "1.17.3"
   resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.3.tgz#348e1b808ff9585423cb909e9992d89ccdbf4c14"
   integrity sha512-wIPqXANye5BbORbuh74exbwNzj+UWCwWyeEFJzUQ7Fq3W2NSAy+7x7nX1fgbEypr2/TdKqpeuxLnXWgzN533/Q==
@@ -5166,14 +5165,15 @@ http-proxy-middleware@0.19.1:
     lodash "^4.17.11"
     micromatch "^3.1.10"
 
-http-proxy-middleware@^0.20.0:
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.20.0.tgz#5b128f7207985c4ea91b53fab8ad897a48c690d6"
-  integrity sha512-dNJAk71nEJhPiAczQH9hGvE/MT9kEs+zn2Dh+Hi94PGZe1GluQirC7mw5rdREUtWx6qGS1Gu0bZd4qEAg+REgw==
+http-proxy-middleware@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.0.0.tgz#984bbbb38cda7ce4495889388afe8b0f39ccd5c8"
+  integrity sha512-1yM4gD7R/U9R5AwA6STkoj8JfjnMeZIUrd8e23Yc14A7xVVLUWlAikgvidklwq1UOroJ07sc6NWNULeOJMYOeQ==
   dependencies:
-    http-proxy "^1.17.0"
+    "@types/http-proxy" "^1.17.3"
+    http-proxy "^1.18.0"
     is-glob "^4.0.1"
-    lodash "^4.17.14"
+    lodash "^4.17.15"
     micromatch "^4.0.2"
 
 http-proxy@1.15.2:
@@ -5184,7 +5184,7 @@ http-proxy@1.15.2:
     eventemitter3 "1.x.x"
     requires-port "1.x.x"
 
-http-proxy@^1.13.0, http-proxy@^1.17.0:
+http-proxy@^1.13.0, http-proxy@^1.17.0, http-proxy@^1.18.0:
   version "1.18.0"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz#dbe55f63e75a347db7f3d99974f2692a314a6a3a"
   integrity sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==