Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-26 07:32:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(nuxi, vite): support https with custom domain and hmr (#7680)

Browse Source
This commit is contained in:
pooya parsa 2022-09-20 12:54:52 +02:00 committed by GitHub
parent d47572e55e
commit 720da64b12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/nuxi/package.json
View File

@ -36,7 +36,7 @@
"flat": "^5.0.2", "flat": "^5.0.2",
"giget": "^0.1.7", "giget": "^0.1.7",
"jiti": "^1.16.0", "jiti": "^1.16.0",
"listhen": "^0.3.1", "listhen": "^0.3.4",
"mlly": "^0.5.16", "mlly": "^0.5.16",
"mri": "^1.2.0", "mri": "^1.2.0",
"pathe": "^0.3.8", "pathe": "^0.3.8",

2
packages/nuxi/src/commands/dev.ts
View File

@ -94,7 +94,7 @@ export default defineNuxtCommand({
currentNuxt.options.server.url = listener.url currentNuxt.options.server.url = listener.url
currentNuxt.options.server.port = address.port currentNuxt.options.server.port = address.port
currentNuxt.options.server.host = address.address currentNuxt.options.server.host = address.address
currentNuxt.options.server.https = Boolean(args.https) currentNuxt.options.server.https = listener.https
await Promise.all([ await Promise.all([
writeTypes(currentNuxt).catch(console.error), writeTypes(currentNuxt).catch(console.error),

2
packages/schema/src/config/server.ts
View File

@ -20,6 +20,8 @@ export default <SchemaDefinition>{
* *
* @version 2 * @version 2
* *
* @type {false | { key: string; cert: string }}
*
* @deprecated This option is ignored with Bridge and Nuxt 3 * @deprecated This option is ignored with Bridge and Nuxt 3
*/ */
https: false, https: false,

12
packages/vite/src/client.ts
View File

@ -2,7 +2,7 @@ import { join, resolve } from 'pathe'
import * as vite from 'vite' import * as vite from 'vite'
import vuePlugin from '@vitejs/plugin-vue' import vuePlugin from '@vitejs/plugin-vue'
import viteJsxPlugin from '@vitejs/plugin-vue-jsx' import viteJsxPlugin from '@vitejs/plugin-vue-jsx'
import type { Connect, HmrOptions } from 'vite' import type { Connect, ServerOptions } from 'vite'
import { logger } from '@nuxt/kit' import { logger } from '@nuxt/kit'
import { getPort } from 'get-port-please' import { getPort } from 'get-port-please'
import { joinURL, withLeadingSlash, withoutLeadingSlash, withTrailingSlash } from 'ufo' import { joinURL, withLeadingSlash, withoutLeadingSlash, withTrailingSlash } from 'ufo'
@ -89,10 +89,12 @@ export async function buildClient (ctx: ViteBuildContext) {
port: hmrPortDefault, port: hmrPortDefault,
ports: Array.from({ length: 20 }, (_, i) => hmrPortDefault + 1 + i) ports: Array.from({ length: 20 }, (_, i) => hmrPortDefault + 1 + i)
}) })
clientConfig.server.hmr = defu(clientConfig.server.hmr as HmrOptions, { clientConfig.server = defu(clientConfig.server, <ServerOptions> {
// https://github.com/nuxt/framework/issues/4191 https: ctx.nuxt.options.server.https,
protocol: 'ws', hmr: {
port: hmrPort protocol: ctx.nuxt.options.server.https ? 'wss' : 'ws',
port: hmrPort
}
}) })
} }

10
yarn.lock
View File

@ -9100,9 +9100,9 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"listhen@npm:^0.3.1": "listhen@npm:^0.3.4":
version: 0.3.1 version: 0.3.4
resolution: "listhen@npm:0.3.1" resolution: "listhen@npm:0.3.4"
dependencies: dependencies:
clipboardy: ^3.0.0 clipboardy: ^3.0.0
colorette: ^2.0.19 colorette: ^2.0.19
@ -9112,7 +9112,7 @@ __metadata:
ip-regex: ^5.0.0 ip-regex: ^5.0.0
node-forge: ^1.3.1 node-forge: ^1.3.1
ufo: ^0.8.5 ufo: ^0.8.5
checksum: 2a260fd6edbf8459be04e6f762617b535a3bbbf92d79e219145c3a301b141b93987a2cfee42081a929e9d92b3628dc2cec93cb1fea4ec0539914c5dc3331fca2 checksum: 36068cd386ba09aaf94280a983cc2e48510e876b307318b1f21af14f85d389297a139caea2d1cc3513641d80c4acc7f7234b941de7db42c2be22690f82200cd4
languageName: node languageName: node
linkType: hard linkType: hard
@ -10478,7 +10478,7 @@ __metadata:
fsevents: ~2.3.2 fsevents: ~2.3.2
giget: ^0.1.7 giget: ^0.1.7
jiti: ^1.16.0 jiti: ^1.16.0
listhen: ^0.3.1 listhen: ^0.3.4
mlly: ^0.5.16 mlly: ^0.5.16
mri: ^1.2.0 mri: ^1.2.0
pathe: ^0.3.8 pathe: ^0.3.8