From 7ea66bd648b6672fc2633a27e4c3d4a9dc4ab567 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Thu, 15 Sep 2022 15:57:05 +0200
Subject: [PATCH 1/3] fix(nuxi): ipv6 support for `nuxi dev`

---
 packages/nuxi/package.json |  2 +-
 yarn.lock                  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/nuxi/package.json b/packages/nuxi/package.json
index e9ec94be284..da94709628a 100644
--- a/packages/nuxi/package.json
+++ b/packages/nuxi/package.json
@@ -36,7 +36,7 @@
     "flat": "^5.0.2",
     "giget": "^0.1.6",
     "jiti": "^1.15.0",
-    "listhen": "^0.3.0",
+    "listhen": "^0.3.1",
     "mlly": "^0.5.14",
     "mri": "^1.2.0",
     "pathe": "^0.3.7",
diff --git a/yarn.lock b/yarn.lock
index 03f2f76ed05..02be78deb17 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9088,9 +9088,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"listhen@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "listhen@npm:0.3.0"
+"listhen@npm:^0.3.1":
+  version: 0.3.1
+  resolution: "listhen@npm:0.3.1"
   dependencies:
     clipboardy: ^3.0.0
     colorette: ^2.0.19
@@ -9100,7 +9100,7 @@ __metadata:
     ip-regex: ^5.0.0
     node-forge: ^1.3.1
     ufo: ^0.8.5
-  checksum: 4b34a6ef14e2bd91325275df567df6592233419f2bfc34195b565e29fa642ad74ffbeab3bcf524c314f4128ce0129d0d443b460c8bc0d1090f888c08cdf970ce
+  checksum: 2a260fd6edbf8459be04e6f762617b535a3bbbf92d79e219145c3a301b141b93987a2cfee42081a929e9d92b3628dc2cec93cb1fea4ec0539914c5dc3331fca2
   languageName: node
   linkType: hard
 
@@ -10454,7 +10454,7 @@ __metadata:
     fsevents: ~2.3.2
     giget: ^0.1.6
     jiti: ^1.15.0
-    listhen: ^0.3.0
+    listhen: ^0.3.1
     mlly: ^0.5.14
     mri: ^1.2.0
     pathe: ^0.3.7

From 5f0b23b7f11a5e3eec5cef7ea6286c43eb5503f8 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Thu, 15 Sep 2022 16:03:13 +0200
Subject: [PATCH 2/3] fix vite: use listener url directly

---
 packages/nuxi/src/commands/dev.ts | 1 +
 packages/vite/src/vite-node.ts    | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/nuxi/src/commands/dev.ts b/packages/nuxi/src/commands/dev.ts
index 05ee66e34ea..d4b6a83604d 100644
--- a/packages/nuxi/src/commands/dev.ts
+++ b/packages/nuxi/src/commands/dev.ts
@@ -91,6 +91,7 @@ export default defineNuxtCommand({
 
         await currentNuxt.hooks.callHook('listen', listener.server, listener)
         const address = listener.server.address() as AddressInfo
+        currentNuxt.options.server.url = listener.url
         currentNuxt.options.server.port = address.port
         currentNuxt.options.server.host = address.address
         currentNuxt.options.server.https = Boolean(args.https)
diff --git a/packages/vite/src/vite-node.ts b/packages/vite/src/vite-node.ts
index 4dc849abcc0..109d1349ce8 100644
--- a/packages/vite/src/vite-node.ts
+++ b/packages/vite/src/vite-node.ts
@@ -123,13 +123,9 @@ function createViteNodeMiddleware (ctx: ViteBuildContext, invalidates: Set<strin
 }
 
 export async function initViteNodeServer (ctx: ViteBuildContext) {
-  const host = ctx.nuxt.options.server.host || 'localhost'
-  const port = ctx.nuxt.options.server.port || '3000'
-  const protocol = ctx.nuxt.options.server.https ? 'https' : 'http'
-
   // Serialize and pass vite-node runtime options
   const viteNodeServerOptions = {
-    baseURL: `${protocol}://${host}:${port}/__nuxt_vite_node__`,
+    baseURL: `${ctx.nuxt.options.server.url}__nuxt_vite_node__`,
     root: ctx.nuxt.options.srcDir,
     entryPath: ctx.entry,
     base: ctx.ssrServer!.config.base || '/_nuxt/'

From 6e285f4206b2197011416f78ac9e6bd8218f4fff Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Thu, 15 Sep 2022 16:14:08 +0200
Subject: [PATCH 3/3] add url to schema

---
 packages/schema/src/config/server.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/schema/src/config/server.ts b/packages/schema/src/config/server.ts
index 51ebed8c4bc..0c16247735e 100644
--- a/packages/schema/src/config/server.ts
+++ b/packages/schema/src/config/server.ts
@@ -39,5 +39,10 @@ export default <SchemaDefinition>{
    * time spent on server-side rendering.
    */
   /** @deprecated This option is ignored with Bridge and Nuxt 3 */
-  timing: (val: any) => val ? ({ total: true, ...val }) : false
+  timing: (val: any) => val ? ({ total: true, ...val }) : false,
+
+  /**
+   * Listening dev server url
+   */
+  url: 'http://localhost:3000',
 }