yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-27 15:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: merge devServer custom configuration with default #12667

Browse Source
This commit is contained in:
Michele Mondelli 2022-02-25 23:20:08 +01:00
parent deb3c8c665
commit c2e7b8a876
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/core/admin/index.js
View File

@ -262,7 +262,12 @@ async function watchAdmin({ plugins, dir, host, port, browser, options }) {
const compiler = webpack(webpackConfig);
const server = new WebpackDevServer(args.devServer, compiler);
const devServerArgs = {
...args.devServer,
...webpackConfig.devServer
}
const server = new WebpackDevServer(devServerArgs, compiler);
const runServer = async () => {
console.log(chalk.green('Starting the development server...'));