Skip to content

Commit 5c8a055

Browse files
committed
build: update dependency webpack-dev-server to v6
See associated pull request for more information. Closes #33514 as a pr takeover
1 parent d520dca commit 5c8a055

5 files changed

Lines changed: 31 additions & 259 deletions

File tree

goldens/public-api/angular_devkit/build_webpack/index.api.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import { BuilderContext } from '@angular-devkit/architect';
88
import { BuilderOutput } from '@angular-devkit/architect';
9+
import type { Configuration } from 'webpack-dev-server';
910
import { Observable } from 'rxjs';
1011
import type webpack from 'webpack';
1112
import type WebpackDevServer from 'webpack-dev-server';
@@ -50,7 +51,7 @@ export function runWebpack(config: webpack.Configuration, context: BuilderContex
5051
// @public @deprecated (undocumented)
5152
export function runWebpackDevServer(config: webpack.Configuration, context: BuilderContext, options?: {
5253
shouldProvideStats?: boolean;
53-
devServerConfig?: WebpackDevServer.Configuration;
54+
devServerConfig?: Configuration;
5455
logging?: WebpackLoggingCallback;
5556
webpackFactory?: WebpackFactory;
5657
webpackDevServerFactory?: WebpackDevServerFactory;

packages/angular_devkit/build_angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"tslib": "2.8.1",
5757
"webpack": "5.109.2",
5858
"webpack-dev-middleware": "8.1.0",
59-
"webpack-dev-server": "5.2.6",
59+
"webpack-dev-server": "6.0.0",
6060
"webpack-merge": "6.0.1",
6161
"webpack-subresource-integrity": "5.1.0"
6262
},

packages/angular_devkit/build_webpack/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
"@angular-devkit/core": "workspace:0.0.0-PLACEHOLDER",
2424
"@ngtools/webpack": "workspace:0.0.0-PLACEHOLDER",
2525
"webpack": "5.109.2",
26-
"webpack-dev-server": "5.2.6"
26+
"webpack-dev-server": "6.0.0"
2727
},
2828
"peerDependencies": {
2929
"webpack": "^5.30.0",
30-
"webpack-dev-server": "^5.0.2"
30+
"webpack-dev-server": "^5.0.2 || ^6.0.0"
3131
}
3232
}

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

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { resolve as pathResolve } from 'node:path';
1212
import { Observable, from, isObservable, of, switchMap } from 'rxjs';
1313
import type webpack from 'webpack';
1414
import type WebpackDevServer from 'webpack-dev-server';
15+
import type { Configuration } from 'webpack-dev-server';
1516
import { getEmittedFiles, getWebpackConfig } from '../../utils';
1617
import { BuildResult, WebpackFactory, WebpackLoggingCallback } from '../webpack';
1718
import { Schema as WebpackDevServerBuilderSchema } from './schema';
@@ -33,7 +34,7 @@ export function runWebpackDevServer(
3334
context: BuilderContext,
3435
options: {
3536
shouldProvideStats?: boolean;
36-
devServerConfig?: WebpackDevServer.Configuration;
37+
devServerConfig?: Configuration;
3738
logging?: WebpackLoggingCallback;
3839
webpackFactory?: WebpackFactory;
3940
webpackDevServerFactory?: WebpackDevServerFactory;
@@ -52,17 +53,6 @@ export function runWebpackDevServer(
5253
}
5354
};
5455

55-
const createWebpackDevServer = (
56-
webpack: webpack.Compiler | webpack.MultiCompiler,
57-
config: WebpackDevServer.Configuration,
58-
) => {
59-
if (options.webpackDevServerFactory) {
60-
return new options.webpackDevServerFactory(config, webpack);
61-
} else {
62-
return from(import('webpack-dev-server').then((mod) => new mod.default(config, webpack)));
63-
}
64-
};
65-
6656
const {
6757
logging: log = (stats, config) => {
6858
if (config.stats !== false) {

0 commit comments

Comments
 (0)