Commit bddd64d

authored

fix: optimize the judgment on whether HTTPS has been set in options (#7202)

1 parent ef08a08 commit bddd64dCopy full SHA for bddd64d

File tree

-1

lines changed

-1

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,11 @@ module.exports = (api, options) => {`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`// resolve server options`
`104`		`- const useHttps = args.https \|\| projectDevServerOptions.https \|\| defaults.https`
	`104`	`+ const modesUseHttps = ['https', 'http2']`
	`105`	`+ const serversUseHttps = ['https', 'spdy']`
	`106`	`+ const optionsUseHttps = modesUseHttps.some(modeName => !!projectDevServerOptions[modeName]) \|\|`
	`107`	`+ (typeof projectDevServerOptions.server === 'string' && serversUseHttps.includes(projectDevServerOptions.server))`
	`108`	`+ const useHttps = args.https \|\| optionsUseHttps \|\| defaults.https`
`105`	`109`	`const protocol = useHttps ? 'https' : 'http'`
`106`	`110`	`const host = args.host \|\| process.env.HOST \|\| projectDevServerOptions.host \|\| defaults.host`
`107`	`111`	`portfinder.basePort = args.port \|\| process.env.PORT \|\| projectDevServerOptions.port \|\| defaults.port`

Comments

(0)