Commit 0260e4d

authored

fix: add devServer.server.type to useHttps judgement (#7222)

1 parent 07052c4 commit 0260e4dCopy full SHA for 0260e4d

File tree

-1

lines changed

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,8 @@ module.exports = (api, options) => {`
`108`	`108`	`const modesUseHttps = ['https', 'http2']`
`109`	`109`	`const serversUseHttps = ['https', 'spdy']`
`110`	`110`	`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))`
`112`	`113`	`const useHttps = args.https \|\| optionsUseHttps \|\| defaults.https`
`113`	`114`	`const protocol = useHttps ? 'https' : 'http'`
`114`	`115`	`const host = args.host \|\| process.env.HOST \|\| projectDevServerOptions.host \|\| defaults.host`

Comments

(0)