From 675f3a8110741bb0fc720decea1a119fdc31ba30 Mon Sep 17 00:00:00 2001 From: BackRunner Date: Sun, 19 Jun 2022 22:20:12 +0800 Subject: [PATCH 1/2] fix: optimize the judgment on whether HTTPS has been set in options --- packages/@vue/cli-service/lib/commands/serve.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/@vue/cli-service/lib/commands/serve.js b/packages/@vue/cli-service/lib/commands/serve.js index cc66855e8b..b59fc661a2 100644 --- a/packages/@vue/cli-service/lib/commands/serve.js +++ b/packages/@vue/cli-service/lib/commands/serve.js @@ -101,7 +101,11 @@ module.exports = (api, options) => { } // resolve server options - const useHttps = args.https || projectDevServerOptions.https || defaults.https + const modesUseHttps = ['https', 'http2'] + const serversUseHttps = ['https', 'spdy'] + const optionsUseHttps = modesUseHttps.some(modeName => !!projectDevServerOptions[modeName]) + || (typeof projectDevServerOptions.server === 'string' && serversUseHttps.includes(projectDevServerOptions.server)) + const useHttps = args.https || optionsUseHttps || defaults.https const protocol = useHttps ? 'https' : 'http' const host = args.host || process.env.HOST || projectDevServerOptions.host || defaults.host portfinder.basePort = args.port || process.env.PORT || projectDevServerOptions.port || defaults.port From acc81e65f7603012254d6c6eba0b6526633b6528 Mon Sep 17 00:00:00 2001 From: BackRunner Date: Sun, 19 Jun 2022 22:35:52 +0800 Subject: [PATCH 2/2] chore: fix lint issue --- packages/@vue/cli-service/lib/commands/serve.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/@vue/cli-service/lib/commands/serve.js b/packages/@vue/cli-service/lib/commands/serve.js index b59fc661a2..c4fad51798 100644 --- a/packages/@vue/cli-service/lib/commands/serve.js +++ b/packages/@vue/cli-service/lib/commands/serve.js @@ -103,8 +103,8 @@ module.exports = (api, options) => { // resolve server options const modesUseHttps = ['https', 'http2'] const serversUseHttps = ['https', 'spdy'] - const optionsUseHttps = modesUseHttps.some(modeName => !!projectDevServerOptions[modeName]) - || (typeof projectDevServerOptions.server === 'string' && serversUseHttps.includes(projectDevServerOptions.server)) + const optionsUseHttps = modesUseHttps.some(modeName => !!projectDevServerOptions[modeName]) || + (typeof projectDevServerOptions.server === 'string' && serversUseHttps.includes(projectDevServerOptions.server)) const useHttps = args.https || optionsUseHttps || defaults.https const protocol = useHttps ? 'https' : 'http' const host = args.host || process.env.HOST || projectDevServerOptions.host || defaults.host