Skip to content

Commit 0260e4d

Browse files
authored
fix: add devServer.server.type to useHttps judgement (#7222)
1 parent 07052c4 commit 0260e4d

File tree

1 file changed

+2
-1
lines changed
  • packages/@vue/cli-service/lib/commands

1 file changed

+2
-1
lines changed

packages/@vue/cli-service/lib/commands/serve.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,8 @@ module.exports = (api, options) => {
108108
const modesUseHttps = ['https', 'http2']
109109
const serversUseHttps = ['https', 'spdy']
110110
const optionsUseHttps = modesUseHttps.some(modeName => !!projectDevServerOptions[modeName]) ||
111-
(typeof projectDevServerOptions.server === 'string' && serversUseHttps.includes(projectDevServerOptions.server))
111+
(typeof projectDevServerOptions.server === 'string' && serversUseHttps.includes(projectDevServerOptions.server)) ||
112+
(typeof projectDevServerOptions.server === 'object' && projectDevServerOptions.server !== null && serversUseHttps.includes(projectDevServerOptions.server.type))
112113
const useHttps = args.https || optionsUseHttps || defaults.https
113114
const protocol = useHttps ? 'https' : 'http'
114115
const host = args.host || process.env.HOST || projectDevServerOptions.host || defaults.host

0 commit comments

Comments
 (0)