From ba43eae8f96636f36c68509dbdf137fb893db262 Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Wed, 8 Jun 2022 02:54:27 +0800 Subject: [PATCH 1/3] feat: show baseUrl in terminal --- packages/nuxi/src/commands/dev.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/nuxi/src/commands/dev.ts b/packages/nuxi/src/commands/dev.ts index 4f79433db46..d1471a92fc2 100644 --- a/packages/nuxi/src/commands/dev.ts +++ b/packages/nuxi/src/commands/dev.ts @@ -38,6 +38,7 @@ export default defineNuxtCommand({ port: args.port || args.p || process.env.NUXT_PORT, hostname: args.host || args.h || process.env.NUXT_HOST, https: Boolean(args.https), + baseURL: args.baseURL || process.env.NUXT_BASE_URL, certificate: (args['ssl-cert'] && args['ssl-key']) && { cert: args['ssl-cert'], key: args['ssl-key'] @@ -69,7 +70,9 @@ export default defineNuxtCommand({ currentHandler = currentNuxt.server.app if (isRestart && args.clear !== false) { showBanner() - listener.showURL() + listener.showURL({ + baseURL: currentNuxt.options.app.baseURL + }) } } catch (err) { consola.error(`Cannot ${isRestart ? 'restart' : 'start'} nuxt: `, err) From 47ade4c69ed33efd884c9c4082212de544ae39b3 Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Tue, 12 Jul 2022 13:34:36 +0800 Subject: [PATCH 2/3] feat: update --- packages/nuxi/src/commands/dev.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/nuxi/src/commands/dev.ts b/packages/nuxi/src/commands/dev.ts index 072b84c7aed..aa9f2a80011 100644 --- a/packages/nuxi/src/commands/dev.ts +++ b/packages/nuxi/src/commands/dev.ts @@ -34,12 +34,12 @@ export default defineNuxtCommand({ } 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: Boolean(args.https), - baseURL: args.baseURL || process.env.NUXT_BASE_URL, certificate: (args['ssl-cert'] && args['ssl-key']) && { cert: args['ssl-cert'], key: args['ssl-key'] @@ -62,6 +62,12 @@ export default defineNuxtCommand({ await currentNuxt.close() } currentNuxt = await loadNuxt({ rootDir, dev: true, ready: false }) + if (!isRestart) { + listener.showURL({ + baseURL: currentNuxt.options.app.baseURL + }) + } + await currentNuxt.ready() await currentNuxt.hooks.callHook('listen', listener.server, listener) await Promise.all([ From 10981e15b0f714419e0ad6abae2d9cf39f6195a3 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Tue, 12 Jul 2022 13:56:56 +0200 Subject: [PATCH 3/3] refactor function and normalize slash (workaround) --- packages/nuxi/src/commands/dev.ts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/nuxi/src/commands/dev.ts b/packages/nuxi/src/commands/dev.ts index aa9f2a80011..486aaab90e1 100644 --- a/packages/nuxi/src/commands/dev.ts +++ b/packages/nuxi/src/commands/dev.ts @@ -51,6 +51,12 @@ export default defineNuxtCommand({ const { loadNuxt, buildNuxt } = await loadKit(rootDir) let currentNuxt: Nuxt + const showURL = () => { + listener.showURL({ + // TODO: Normalize URL with trailing slash within schema + baseURL: withTrailingSlash(currentNuxt?.options.app.baseURL) || '/' + }) + } const load = async (isRestart: boolean, reason?: string) => { try { loadingMessage = `${reason ? reason + '. ' : ''}${isRestart ? 'Restarting' : 'Starting'} nuxt...` @@ -63,9 +69,7 @@ export default defineNuxtCommand({ } currentNuxt = await loadNuxt({ rootDir, dev: true, ready: false }) if (!isRestart) { - listener.showURL({ - baseURL: currentNuxt.options.app.baseURL - }) + showURL() } await currentNuxt.ready() @@ -77,9 +81,7 @@ export default defineNuxtCommand({ currentHandler = currentNuxt.server.app if (isRestart && args.clear !== false) { showBanner() - listener.showURL({ - baseURL: currentNuxt.options.app.baseURL - }) + showURL() } } catch (err) { consola.error(`Cannot ${isRestart ? 'restart' : 'start'} nuxt: `, err)