File tree Expand file tree Collapse file tree 1 file changed +7
-3
lines changed
packages/@vue/cli-service/lib/commands Expand file tree Collapse file tree 1 file changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -42,12 +42,16 @@ module.exports = (api, options) => {
42
42
const prepareProxy = require ( '../util/prepareProxy' )
43
43
const launchEditorMiddleware = require ( 'launch-editor-middleware' )
44
44
45
- // load user devServer options
46
- const projectDevServerOptions = options . devServer || { }
47
-
48
45
// resolve webpack config
49
46
const webpackConfig = api . resolveWebpackConfig ( )
50
47
48
+ // load user devServer options with higher priority than devServer
49
+ // in webpck config
50
+ const projectDevServerOptions = Object . assign (
51
+ webpackConfig . devServer || { } ,
52
+ options . devServer
53
+ )
54
+
51
55
// expose advanced stats
52
56
if ( args . dashboard ) {
53
57
const DashboardPlugin = require ( '../webpack/DashboardPlugin' )
You can’t perform that action at this time.
0 commit comments