Skip to content

Commit 2b789b3

Browse files
alan-agius4dgp1130
authored andcommitted
refactor: remove @types/webpack-dev-server
This package is no longer needed since `webpack-dev-server` now has it's own typings.
1 parent f70f871 commit 2b789b3

File tree

6 files changed

+7
-40
lines changed

6 files changed

+7
-40
lines changed

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
]
6161
},
6262
"resolutions": {
63-
"**/@types/webpack-dev-server/webpack": "5.65.0",
6463
"ajv-formats/ajv": "8.8.2"
6564
},
6665
"devDependencies": {
@@ -118,7 +117,6 @@
118117
"@types/semver": "^7.0.0",
119118
"@types/text-table": "^0.2.1",
120119
"@types/uuid": "^8.0.0",
121-
"@types/webpack-dev-server": "^4.5.0",
122120
"@typescript-eslint/eslint-plugin": "5.9.0",
123121
"@typescript-eslint/parser": "5.9.0",
124122
"@yarnpkg/lockfile": "1.1.0",

packages/angular_devkit/build_angular/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ ts_library(
124124
"@npm//@types/postcss-preset-env",
125125
"@npm//@types/semver",
126126
"@npm//@types/text-table",
127-
"@npm//@types/webpack-dev-server",
128127
"@npm//ajv",
129128
"@npm//ansi-colors",
130129
"@npm//babel-loader",

packages/angular_devkit/build_angular/src/builders/dev-server/index.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,11 +246,13 @@ export function serveWebpackBrowser(
246246
}).pipe(
247247
concatMap(async (buildEvent, index) => {
248248
// Resolve serve address.
249+
const publicPath = webpackConfig.devServer?.devMiddleware?.publicPath;
250+
249251
const serverAddress = url.format({
250252
protocol: options.ssl ? 'https' : 'http',
251253
hostname: options.host === '0.0.0.0' ? 'localhost' : options.host,
252254
port: buildEvent.port,
253-
pathname: webpackConfig.devServer?.devMiddleware?.publicPath,
255+
pathname: typeof publicPath === 'string' ? publicPath : undefined,
254256
});
255257

256258
if (index === 0) {

packages/angular_devkit/build_webpack/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ ts_library(
4646
deps = [
4747
"//packages/angular_devkit/architect",
4848
"@npm//@types/node",
49-
"@npm//@types/webpack-dev-server",
5049
"@npm//rxjs",
5150
"@npm//webpack",
5251
"@npm//webpack-dev-server",

packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export function runWebpackDevServer(
8383

8484
const devServer = createWebpackDevServer(webpackCompiler, devServerConfig);
8585
devServer.startCallback(() => {
86-
const address = devServer.server.address();
86+
const address = devServer.server?.address();
8787
if (!address) {
8888
obs.error(new Error(`Dev-server address info is not defined.`));
8989

yarn.lock

Lines changed: 3 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2679,13 +2679,6 @@
26792679
"@types/connect" "*"
26802680
"@types/node" "*"
26812681

2682-
"@types/bonjour@*":
2683-
version "3.5.9"
2684-
resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.9.tgz#3cc4e5135dbb5940fc6051604809234612f89cb4"
2685-
integrity sha512-VkZUiYevvtPyFu5XtpYw9a8moCSzxgjs5PAFF4yXjA7eYHvzBlXe+eJdqBBNWWVzI1r7Ki0KxMYvaQuhm+6f5A==
2686-
dependencies:
2687-
"@types/node" "*"
2688-
26892682
"@types/bonjour@^3.5.9":
26902683
version "3.5.10"
26912684
resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.10.tgz#0f6aadfe00ea414edc86f5d106357cda9701e275"
@@ -2727,7 +2720,7 @@
27272720
resolved "https://registry.yarnpkg.com/@types/component-emitter/-/component-emitter-1.2.11.tgz#50d47d42b347253817a39709fef03ce66a108506"
27282721
integrity sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ==
27292722

2730-
"@types/connect-history-api-fallback@*", "@types/connect-history-api-fallback@^1.3.5":
2723+
"@types/connect-history-api-fallback@^1.3.5":
27312724
version "1.3.5"
27322725
resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae"
27332726
integrity sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==
@@ -3049,7 +3042,7 @@
30493042
resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.9.tgz#152c6c20a7688c30b967ec1841d31ace569863fc"
30503043
integrity sha512-L/TMpyURfBkf+o/526Zb6kd/tchUP3iBDEPjqjb+U2MAJhVRxxrmr2fwpe08E7QsV7YLcpq0tUaQ9O9x97ZIxQ==
30513044

3052-
"@types/serve-index@*", "@types/serve-index@^1.9.1":
3045+
"@types/serve-index@^1.9.1":
30533046
version "1.9.1"
30543047
resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278"
30553048
integrity sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==
@@ -3110,30 +3103,6 @@
31103103
resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.3.tgz#c6a60686d953dbd1b1d45e66f4ecdbd5d471b4d0"
31113104
integrity sha512-0LbEEx1zxrYB3pgpd1M5lEhLcXjKJnYghvhTRgaBeUivLHMDM1TzF3IJ6hXU2+8uA4Xz+5BA63mtZo5DjVT8iA==
31123105

3113-
"@types/webpack-dev-middleware@*":
3114-
version "5.0.2"
3115-
resolved "https://registry.yarnpkg.com/@types/webpack-dev-middleware/-/webpack-dev-middleware-5.0.2.tgz#0f66566c2ca7d484891b4552c8a7b64a3044e3e2"
3116-
integrity sha512-S3WUtef//Vx6WETyWZkM45WqgRxWSaqbpWtPcKySNRhiQNyhCqM9EueggaMX3L9N2IbG4dJIK5PgYcAWUifUbA==
3117-
dependencies:
3118-
"@types/connect" "*"
3119-
tapable "^2.1.1"
3120-
webpack "^5.38.1"
3121-
3122-
"@types/webpack-dev-server@^4.5.0":
3123-
version "4.5.0"
3124-
resolved "https://registry.yarnpkg.com/@types/webpack-dev-server/-/webpack-dev-server-4.5.0.tgz#52a983de97db81a38b7309a8cf8a730c3e02f28e"
3125-
integrity sha512-HMb6pZPANObue3LwbdpQLWzQyF9O0wntiPyXj4vGutlAbNKTXH4hDCHaZyfvfZDmFn+5HprrWHm1TGt3awNr/A==
3126-
dependencies:
3127-
"@types/bonjour" "*"
3128-
"@types/connect-history-api-fallback" "*"
3129-
"@types/express" "*"
3130-
"@types/serve-index" "*"
3131-
"@types/serve-static" "*"
3132-
"@types/webpack-dev-middleware" "*"
3133-
chokidar "^3.5.1"
3134-
http-proxy-middleware "^2.0.0"
3135-
webpack "*"
3136-
31373106
"@types/webpack-sources@*":
31383107
version "3.2.0"
31393108
resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-3.2.0.tgz#16d759ba096c289034b26553d2df1bf45248d38b"
@@ -12085,7 +12054,7 @@ webpack-subresource-integrity@5.0.0:
1208512054
dependencies:
1208612055
typed-assert "^1.0.8"
1208712056

12088-
webpack@*, webpack@5.65.0, webpack@^5.38.1:
12057+
webpack@5.65.0:
1208912058
version "5.65.0"
1209012059
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.65.0.tgz#ed2891d9145ba1f0d318e4ea4f89c3fa18e6f9be"
1209112060
integrity sha512-Q5or2o6EKs7+oKmJo7LaqZaMOlDWQse9Tm5l1WAfU/ujLGN5Pb0SqGeVkN/4bpPmEqEP5RnVhiqsOtWtUVwGRw==

0 commit comments

Comments
 (0)