From 6a0a5d55a0d330afebd09c8971bf87baa970c7c6 Mon Sep 17 00:00:00 2001
From: bluwy <bjornlu.dev@gmail.com>
Date: Sat, 2 Dec 2023 14:09:22 +0800
Subject: [PATCH] Remove server urls shortcut

---
 .changeset/old-cherries-beg.md         |  1 -
 packages/astro/src/core/dev/restart.ts | 14 ++---------
 packages/astro/src/core/logger/vite.ts |  5 ++--
 packages/astro/src/core/messages.ts    | 35 ++++++++------------------
 4 files changed, 16 insertions(+), 39 deletions(-)

diff --git a/.changeset/old-cherries-beg.md b/.changeset/old-cherries-beg.md
index 8446b904b948..b39aa2f1f230 100644
--- a/.changeset/old-cherries-beg.md
+++ b/.changeset/old-cherries-beg.md
@@ -5,6 +5,5 @@
 Adds CLI shortcuts for the dev server:
 
 - `r + enter`: restarts the dev server
-- `u + enter`: shows the server URLs
 - `o + enter`: opens the site in your browser
 - `q + enter`: quits the dev server
diff --git a/packages/astro/src/core/dev/restart.ts b/packages/astro/src/core/dev/restart.ts
index 05c39c1c2ce2..714365794d88 100644
--- a/packages/astro/src/core/dev/restart.ts
+++ b/packages/astro/src/core/dev/restart.ts
@@ -7,7 +7,7 @@ import { createNodeLogger, createSettings, resolveConfig } from '../config/index
 import { collectErrorMetadata } from '../errors/dev/utils.js';
 import { isAstroConfigZodError } from '../errors/errors.js';
 import { createSafeError } from '../errors/index.js';
-import { formatErrorMessage, serverUrls } from '../messages.js';
+import { formatErrorMessage } from '../messages.js';
 import type { Container } from './container.js';
 import { createContainer, startContainer } from './container.js';
 
@@ -176,17 +176,7 @@ export async function createContainerWithAutomaticRestart({
 					key: 'u',
 					description: 'show server url',
 					action() {
-						logger.info(
-							'SKIP_FORMAT',
-							serverUrls({
-								resolvedUrls: restart.container.viteServer.resolvedUrls || {
-									local: [],
-									network: [],
-								},
-								host: restart.container.settings.config.server.host,
-								base: restart.container.settings.config.base,
-							})
-						);
+						// TODO: show the server urls
 					},
 				},
 			],
diff --git a/packages/astro/src/core/logger/vite.ts b/packages/astro/src/core/logger/vite.ts
index baec8761fab6..710e35feda45 100644
--- a/packages/astro/src/core/logger/vite.ts
+++ b/packages/astro/src/core/logger/vite.ts
@@ -52,8 +52,9 @@ export function createViteLogger(
 			}
 			// Log shortcuts help messages without indent
 			else if (viteShortcutHelpMsg.test(stripped)) {
-				// Don't log clear screen shortcut, we don't allow clear screen
-				if (stripped.includes('c + enter')) return;
+				// Remove Vite's builtin shortcuts we don't support. We can do this cleaner once
+				// https://github.com/vitejs/vite/pull/15218 lands
+				if (stripped.includes('c + enter') || stripped.includes('u + enter')) return;
 				astroLogger.info('shortcut', msg.replace(/\s+press/, 'press'));
 			}
 			// Fallback
diff --git a/packages/astro/src/core/messages.ts b/packages/astro/src/core/messages.ts
index 963f30118906..b105e985cb05 100644
--- a/packages/astro/src/core/messages.ts
+++ b/packages/astro/src/core/messages.ts
@@ -62,29 +62,6 @@ export function serverStart({
 }): string {
 	// PACKAGE_VERSION is injected at build-time
 	const version = process.env.PACKAGE_VERSION ?? '0.0.0';
-
-	const messages = [
-		'',
-		`${bgGreen(bold(` astro `))} ${green(`v${version}`)} ${dim(`ready in`)} ${Math.round(
-			startupTime
-		)} ${dim('ms')}`,
-		'',
-		serverUrls({ resolvedUrls, host, base }),
-		`${dim('┃')} Press ${bold('h + enter')} for shortcuts`,
-		'',
-	];
-	return messages.filter((msg) => typeof msg === 'string').join('\n');
-}
-
-export function serverUrls({
-	resolvedUrls,
-	host,
-	base,
-}: {
-	resolvedUrls: ResolvedServerUrls;
-	host: string | boolean;
-	base: string;
-}) {
 	const localPrefix = `${dim('┃')} Local    `;
 	const networkPrefix = `${dim('┃')} Network  `;
 	const emptyPrefix = ' '.repeat(11);
@@ -105,7 +82,17 @@ export function serverUrls({
 		}
 	}
 
-	return [...localUrlMessages, ...networkUrlMessages].join('\n');
+	const messages = [
+		'',
+		`${bgGreen(bold(` astro `))} ${green(`v${version}`)} ${dim(`ready in`)} ${Math.round(
+			startupTime
+		)} ${dim('ms')}`,
+		'',
+		...localUrlMessages,
+		...networkUrlMessages,
+		'',
+	];
+	return messages.filter((msg) => typeof msg === 'string').join('\n');
 }
 
 export function telemetryNotice() {