diff --git a/package.json b/package.json index f353936..12850c0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ffbt", - "version": "1.0.0-rc.3", + "version": "1.0.0-rc.4", "description": "Build a Typescript app without pain", "license": "MIT", "engines": { @@ -49,11 +49,11 @@ "tslib": "^2.4.1", "tslint": "^6.0.0", "tslint-config-airbnb": "^5.11.2", - "typescript": "^4.3.4", + "typescript": "^4.9.5", "url-loader": "^4.1.1", "webpack": "^5.75.0", "webpack-bundle-analyzer": "^4.8.0", - "webpack-dev-server": "^4.11.1", + "webpack-dev-server": "^5.2.6", "webpack-merge": "^5.8.0", "webpack-notifier": "^1.15.0" }, @@ -63,7 +63,6 @@ "@types/jest": "^27.5.2", "@types/node": "^14.17.4", "@types/stylelint": "^13.13.3", - "@types/webpack-dev-server": "^4.7.2", "@types/webpack-merge": "^5.0.0", "jest": "^27.3.1", "ts-jest": "^27.0.7", diff --git a/src/services/webpack/runner/run-webpack-dev-server.ts b/src/services/webpack/runner/run-webpack-dev-server.ts index 8781408..9feaea9 100644 --- a/src/services/webpack/runner/run-webpack-dev-server.ts +++ b/src/services/webpack/runner/run-webpack-dev-server.ts @@ -10,18 +10,23 @@ export class RunWebpackDevServerStrategy implements ServiceRunStrategy { run(): void { const compiler = webpack(this.webpackConfig); - const server = new WebpackDevServer(compiler, this.webpackConfig.devServer || {}); - const {port, host} = { - port: 9091, - host: "localhost", - ...this.webpackConfig.devServer, - }; + // webpack-dev-server v5 takes the options as the first argument and the + // compiler as the second, and reads port/host from those options rather + // than from listen() arguments. + const server = new WebpackDevServer( + { + port: 9091, + host: "localhost", + ...this.webpackConfig.devServer, + }, + compiler, + ); - server.listen(port, host, console.error); + server.start().catch(console.error); cleanupIfError(() => { - server.close(); + server.stop(); }); } }