Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion goldens/public-api/angular_devkit/build_webpack/index.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import { BuilderContext } from '@angular-devkit/architect';
import { BuilderOutput } from '@angular-devkit/architect';
import type { Configuration } from 'webpack-dev-server';
import { Observable } from 'rxjs';
import type webpack from 'webpack';
import type WebpackDevServer from 'webpack-dev-server';
Expand Down Expand Up @@ -50,7 +51,7 @@ export function runWebpack(config: webpack.Configuration, context: BuilderContex
// @public @deprecated (undocumented)
export function runWebpackDevServer(config: webpack.Configuration, context: BuilderContext, options?: {
shouldProvideStats?: boolean;
devServerConfig?: WebpackDevServer.Configuration;
devServerConfig?: Configuration;
logging?: WebpackLoggingCallback;
webpackFactory?: WebpackFactory;
webpackDevServerFactory?: WebpackDevServerFactory;
Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"tslib": "2.8.1",
"webpack": "5.109.2",
"webpack-dev-middleware": "8.1.0",
"webpack-dev-server": "5.2.6",
"webpack-dev-server": "6.0.0",
"webpack-merge": "6.0.1",
"webpack-subresource-integrity": "5.1.0"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/angular_devkit/build_webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
"@angular-devkit/core": "workspace:0.0.0-PLACEHOLDER",
"@ngtools/webpack": "workspace:0.0.0-PLACEHOLDER",
"webpack": "5.109.2",
"webpack-dev-server": "5.2.6"
"webpack-dev-server": "6.0.0"
},
"peerDependencies": {
"webpack": "^5.30.0",
"webpack-dev-server": "^5.0.2"
"webpack-dev-server": "^5.0.2 || ^6.0.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { resolve as pathResolve } from 'node:path';
import { Observable, from, isObservable, of, switchMap } from 'rxjs';
import type webpack from 'webpack';
import type WebpackDevServer from 'webpack-dev-server';
import type { Configuration } from 'webpack-dev-server';
import { getEmittedFiles, getWebpackConfig } from '../../utils';
import { BuildResult, WebpackFactory, WebpackLoggingCallback } from '../webpack';
import { Schema as WebpackDevServerBuilderSchema } from './schema';
Expand All @@ -33,7 +34,7 @@ export function runWebpackDevServer(
context: BuilderContext,
options: {
shouldProvideStats?: boolean;
devServerConfig?: WebpackDevServer.Configuration;
devServerConfig?: Configuration;
Comment thread
alan-agius4 marked this conversation as resolved.
logging?: WebpackLoggingCallback;
webpackFactory?: WebpackFactory;
webpackDevServerFactory?: WebpackDevServerFactory;
Expand All @@ -52,17 +53,6 @@ export function runWebpackDevServer(
}
};

const createWebpackDevServer = (
webpack: webpack.Compiler | webpack.MultiCompiler,
config: WebpackDevServer.Configuration,
) => {
if (options.webpackDevServerFactory) {
return new options.webpackDevServerFactory(config, webpack);
} else {
return from(import('webpack-dev-server').then((mod) => new mod.default(config, webpack)));
}
};

const {
logging: log = (stats, config) => {
if (config.stats !== false) {
Expand Down
Loading