Skip to content

Commit c7b2870

Browse files
alan-agius4dgp1130
authored andcommitted
refactor(@angular-devkit/build-angular): replace usage of webpack-dev-server deprecated https option
See: https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md#450-2021-11-13
1 parent bc85637 commit c7b2870

File tree

3 files changed

+20
-15
lines changed

3 files changed

+20
-15
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
"@types/semver": "^7.0.0",
120120
"@types/text-table": "^0.2.1",
121121
"@types/uuid": "^8.0.0",
122-
"@types/webpack-dev-server": "^4.0.3",
122+
"@types/webpack-dev-server": "^4.5.0",
123123
"@typescript-eslint/eslint-plugin": "5.4.0",
124124
"@typescript-eslint/parser": "5.4.0",
125125
"@yarnpkg/lockfile": "1.1.0",

packages/angular_devkit/build_angular/src/webpack/configs/dev-server.ts

+15-9
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export async function getDevServerConfig(
8383
},
8484
compress: false,
8585
static: false,
86-
https: getSslConfig(root, wco.buildOptions),
86+
server: getServerConfig(root, wco.buildOptions),
8787
allowedHosts: getAllowedHostsConfig(wco.buildOptions),
8888
devMiddleware: {
8989
publicPath: servePath,
@@ -139,19 +139,25 @@ export function buildServePath(
139139
* Private method to enhance a webpack config with SSL configuration.
140140
* @private
141141
*/
142-
function getSslConfig(
142+
function getServerConfig(
143143
root: string,
144144
options: WebpackDevServerOptions,
145-
): DevServerConfiguration['https'] {
145+
): DevServerConfiguration['server'] {
146146
const { ssl, sslCert, sslKey } = options;
147-
if (ssl && sslCert && sslKey) {
148-
return {
149-
key: resolve(root, sslKey),
150-
cert: resolve(root, sslCert),
151-
};
147+
if (!ssl) {
148+
return 'http';
152149
}
153150

154-
return ssl;
151+
return {
152+
type: 'https',
153+
options:
154+
sslCert && sslKey
155+
? {
156+
key: resolve(root, sslKey),
157+
cert: resolve(root, sslCert),
158+
}
159+
: undefined,
160+
};
155161
}
156162

157163
/**

yarn.lock

+4-5
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@
114114

115115
"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#6cdeb28b4c4adfa8c7e3a84f5ca5cb11bab21760":
116116
version "0.0.0-2357f952775070b44dbc09363c4593d033b982b3"
117-
uid "6cdeb28b4c4adfa8c7e3a84f5ca5cb11bab21760"
118117
resolved "https://github.com/angular/dev-infra-private-builds.git#6cdeb28b4c4adfa8c7e3a84f5ca5cb11bab21760"
119118
dependencies:
120119
"@actions/core" "^1.4.0"
@@ -2274,10 +2273,10 @@
22742273
tapable "^2.1.1"
22752274
webpack "^5.38.1"
22762275

2277-
"@types/webpack-dev-server@^4.0.3":
2278-
version "4.3.1"
2279-
resolved "https://registry.yarnpkg.com/@types/webpack-dev-server/-/webpack-dev-server-4.3.1.tgz#e6174f753aabdd3b2de8e4bc98df024365067011"
2280-
integrity sha512-sFAFnvz1Ah17Kt4pFjATbPtuAmFS9s2dUUKhpz0kkB+X7vpJF2tbO7JoHP42od0SKijtrB7CHbsa3/lnztjpvw==
2276+
"@types/webpack-dev-server@^4.5.0":
2277+
version "4.5.0"
2278+
resolved "https://registry.yarnpkg.com/@types/webpack-dev-server/-/webpack-dev-server-4.5.0.tgz#52a983de97db81a38b7309a8cf8a730c3e02f28e"
2279+
integrity sha512-HMb6pZPANObue3LwbdpQLWzQyF9O0wntiPyXj4vGutlAbNKTXH4hDCHaZyfvfZDmFn+5HprrWHm1TGt3awNr/A==
22812280
dependencies:
22822281
"@types/bonjour" "*"
22832282
"@types/connect-history-api-fallback" "*"

0 commit comments

Comments
 (0)