Skip to content
This repository was archived by the owner on Nov 22, 2024. It is now read-only.

Commit 9faaa66

Browse files
alan-agius4alan-agius4
committed
build: update @types/express and http-proxy-middleware
1 parent 281a3c8 commit 9faaa66

File tree

7 files changed

+31
-30
lines changed

7 files changed

+31
-30
lines changed

‎modules/builders/BUILD.bazel‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ ts_library(
2626
"@npm//@angular-devkit/architect",
2727
"@npm//@angular-devkit/core",
2828
"@npm//@types/browser-sync",
29-
"@npm//@types/http-proxy-middleware",
3029
"@npm//browser-sync",
3130
"@npm//guess-parser",
3231
"@npm//http-proxy-middleware",

‎modules/builders/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"@angular-devkit/architect": "DEVKIT_ARCHITECT_VERSION",
1818
"@angular-devkit/core": "DEVKIT_CORE_VERSION",
1919
"browser-sync": "^2.26.7",
20-
"http-proxy-middleware": "^0.20.0",
20+
"http-proxy-middleware": "^1.0.0",
2121
"rxjs": "RXJS_VERSION",
2222
"tree-kill": "^1.2.1",
2323
"guess-parser": "^0.4.12"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
} from '@angular-devkit/architect';
1515
import { json, logging, tags } from '@angular-devkit/core';
1616
import * as browserSync from 'browser-sync';
17-
import * as proxy from 'http-proxy-middleware';
17+
import { createProxyMiddleware } from 'http-proxy-middleware';
1818
import { join } from 'path';
1919
import {
2020
EMPTY,
@@ -266,7 +266,7 @@ async function initBrowserSync(
266266
// Remove leading slash
267267
bsOptions.scriptPath = p => p.substring(1),
268268
bsOptions.middleware = [
269-
proxy(defaultSocketIoPath, {
269+
createProxyMiddleware(defaultSocketIoPath, {
270270
target: url.format({
271271
protocol: 'http',
272272
hostname: host,
@@ -275,7 +275,7 @@ async function initBrowserSync(
275275
}),
276276
ws: true,
277277
logLevel: 'silent',
278-
}),
278+
}) as any,
279279
];
280280
}
281281
}

‎modules/express-engine/tokens/BUILD.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@ ng_module(
1313
deps = [
1414
"@npm//@angular/core",
1515
"@npm//@types/express",
16+
"@npm//@types/express-serve-static-core",
1617
],
1718
)

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*/
88
import { InjectionToken } from '@angular/core';
99
import { Request, Response } from 'express';
10+
import { ParamsDictionary } from 'express-serve-static-core';
1011

11-
export const REQUEST = new InjectionToken<Request>('REQUEST');
12+
export const REQUEST = new InjectionToken<Request<ParamsDictionary>>('REQUEST');
1213
export const RESPONSE = new InjectionToken<Response>('RESPONSE');

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,19 @@
6565
"@hapi/hapi": "^18.4.0",
6666
"@schematics/angular": "^9.0.0",
6767
"@types/browser-sync": "^2.26.1",
68-
"@types/express": "4.17.1",
68+
"@types/express": "4.17.2",
69+
"@types/express-serve-static-core": "4.17.2",
6970
"@types/fs-extra": "^8.0.0",
7071
"@types/hapi__hapi": "^19.0.0",
7172
"@types/hapi__inert": "^5.2.0",
72-
"@types/http-proxy-middleware": "^0.19.3",
7373
"@types/jasmine": "^3.4.4",
7474
"@types/node": "^12.11.1",
7575
"@types/shelljs": "^0.8.6",
7676
"browser-sync": "^2.26.7",
7777
"domino": "^2.1.2",
7878
"express": "^4.15.2",
7979
"guess-parser": "^0.4.12",
80-
"http-proxy-middleware": "^0.20.0",
80+
"http-proxy-middleware": "^1.0.0",
8181
"jasmine-core": "^3.0.0",
8282
"karma": "^4.1.0",
8383
"karma-chrome-launcher": "^3.0.0",

‎yarn.lock‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1513,10 +1513,18 @@
15131513
"@types/node" "*"
15141514
"@types/range-parser" "*"
15151515

1516-
"@types/[email protected]":
1517-
version "4.17.1"
1518-
resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.1.tgz#4cf7849ae3b47125a567dfee18bfca4254b88c5c"
1519-
integrity sha512-VfH/XCP0QbQk5B5puLqTLEeFgR8lfCJHZJKkInZ9mkYd+u8byX0kztXEQxEk4wZXJs8HI+7km2ALXjn4YKcX9w==
1516+
"@types/[email protected]":
1517+
version "4.17.2"
1518+
resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.2.tgz#f6f41fa35d42e79dbf6610eccbb2637e6008a0cf"
1519+
integrity sha512-El9yMpctM6tORDAiBwZVLMcxoTMcqqRO9dVyYcn7ycLWbvR8klrDn8CAOwRfZujZtWD7yS/mshTdz43jMOejbg==
1520+
dependencies:
1521+
"@types/node" "*"
1522+
"@types/range-parser" "*"
1523+
1524+
"@types/[email protected]":
1525+
version "4.17.2"
1526+
resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.2.tgz#a0fb7a23d8855bac31bc01d5a58cadd9b2173e6c"
1527+
integrity sha512-5mHFNyavtLoJmnusB8OKJ5bshSzw+qkMIBAobLrIM48HJvunFva9mOa6aBwh64lBFyNwBbs0xiEFuj4eU/NjCA==
15201528
dependencies:
15211529
"@types/body-parser" "*"
15221530
"@types/express-serve-static-core" "*"
@@ -1600,16 +1608,7 @@
16001608
dependencies:
16011609
"@types/node" "*"
16021610

1603-
"@types/http-proxy-middleware@^0.19.3":
1604-
version "0.19.3"
1605-
resolved "https://registry.yarnpkg.com/@types/http-proxy-middleware/-/http-proxy-middleware-0.19.3.tgz#b2eb96fbc0f9ac7250b5d9c4c53aade049497d03"
1606-
integrity sha512-lnBTx6HCOUeIJMLbI/LaL5EmdKLhczJY5oeXZpX/cXE4rRqb3RmV7VcMpiEfYkmTjipv3h7IAyIINe4plEv7cA==
1607-
dependencies:
1608-
"@types/connect" "*"
1609-
"@types/http-proxy" "*"
1610-
"@types/node" "*"
1611-
1612-
"@types/http-proxy@*":
1611+
"@types/http-proxy@^1.17.3":
16131612
version "1.17.3"
16141613
resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.3.tgz#348e1b808ff9585423cb909e9992d89ccdbf4c14"
16151614
integrity sha512-wIPqXANye5BbORbuh74exbwNzj+UWCwWyeEFJzUQ7Fq3W2NSAy+7x7nX1fgbEypr2/TdKqpeuxLnXWgzN533/Q==
@@ -5166,14 +5165,15 @@ [email protected]:
51665165
lodash "^4.17.11"
51675166
micromatch "^3.1.10"
51685167

5169-
http-proxy-middleware@^0.20.0:
5170-
version "0.20.0"
5171-
resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.20.0.tgz#5b128f7207985c4ea91b53fab8ad897a48c690d6"
5172-
integrity sha512-dNJAk71nEJhPiAczQH9hGvE/MT9kEs+zn2Dh+Hi94PGZe1GluQirC7mw5rdREUtWx6qGS1Gu0bZd4qEAg+REgw==
5168+
http-proxy-middleware@^1.0.0:
5169+
version "1.0.0"
5170+
resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.0.0.tgz#984bbbb38cda7ce4495889388afe8b0f39ccd5c8"
5171+
integrity sha512-1yM4gD7R/U9R5AwA6STkoj8JfjnMeZIUrd8e23Yc14A7xVVLUWlAikgvidklwq1UOroJ07sc6NWNULeOJMYOeQ==
51735172
dependencies:
5174-
http-proxy "^1.17.0"
5173+
"@types/http-proxy" "^1.17.3"
5174+
http-proxy "^1.18.0"
51755175
is-glob "^4.0.1"
5176-
lodash "^4.17.14"
5176+
lodash "^4.17.15"
51775177
micromatch "^4.0.2"
51785178

51795179
[email protected]:
@@ -5184,7 +5184,7 @@ [email protected]:
51845184
eventemitter3 "1.x.x"
51855185
requires-port "1.x.x"
51865186

5187-
http-proxy@^1.13.0, http-proxy@^1.17.0:
5187+
http-proxy@^1.13.0, http-proxy@^1.17.0, http-proxy@^1.18.0:
51885188
version "1.18.0"
51895189
resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz#dbe55f63e75a347db7f3d99974f2692a314a6a3a"
51905190
integrity sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==

0 commit comments

Comments
 (0)