fix(nuxi): read devServer options from nuxt config (#19055)

nuxt · Feb 16, 2023 · c45b842 · c45b842
1 parent 681cfa8
commit c45b842
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/packages/nuxi/src/commands/dev.ts b/packages/nuxi/src/commands/dev.ts
@@ -44,20 +44,27 @@ export default defineNuxtCommand({
 
     await setupDotenv({ cwd: rootDir, fileName: args.dotenv })
 
+    const { loadNuxt, loadNuxtConfig, buildNuxt } = await loadKit(rootDir)
+
+    const config = await loadNuxtConfig({
+      cwd: rootDir,
+      overrides: { dev: true }
+    })
+
     const listener = await listen(serverHandler, {
       showURL: false,
       clipboard: args.clipboard,
       open: args.open || args.o,
-      port: args.port || args.p || process.env.NUXT_PORT,
-      hostname: args.host || args.h || process.env.NUXT_HOST,
-      https: args.https && {
-        cert: args['ssl-cert'],
-        key: args['ssl-key']
-      }
+      port: args.port || args.p || process.env.NUXT_PORT || config.devServer.port,
+      hostname: args.host || args.h || process.env.NUXT_HOST || config.devServer.host,
+      https: (args.https !== false && (args.https || config.devServer.https))
+        ? {
+            cert: args['ssl-cert'] || (config.devServer.https && config.devServer.https.cert) || undefined,
+            key: args['ssl-key'] || (config.devServer.https && config.devServer.https.key) || undefined
+          }
+        : false
     })
 
-    const { loadNuxt, buildNuxt } = await loadKit(rootDir)
-
     let currentNuxt: Nuxt
     const showURL = () => {
       listener.showURL({

diff --git a/packages/schema/src/config/dev.ts b/packages/schema/src/config/dev.ts
@@ -28,10 +28,13 @@ export default defineUntypedSchema({
     port: process.env.NUXT_PORT || process.env.NITRO_PORT || process.env.PORT || 3000,
 
     /** Dev server listening host */
-    host: process.env.NUXT_HOST || process.env.NITRO_HOST || process.env.HOST || 'localhost',
+    host: process.env.NUXT_HOST || process.env.NITRO_HOST || process.env.HOST || '',
 
     /**
-     * Listening dev server url
+     * Listening dev server URL.
+     *
+     * This should not be set directly as it will always be overridden by the
+     * dev server with the full URL (for module and internal use).
      */
     url: 'http://localhost:3000',
   }