From bf47c6f74c76a669c3ee2d6be47284b129686508 Mon Sep 17 00:00:00 2001
From: Chris Swithinbank <swithinbank@gmail.com>
Date: Fri, 20 Jan 2023 23:22:06 +0100
Subject: [PATCH] Improve error message for third-party template 404s

---
 packages/create-astro/src/index.ts | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/create-astro/src/index.ts b/packages/create-astro/src/index.ts
index 4a4008438868..5b4973a12123 100644
--- a/packages/create-astro/src/index.ts
+++ b/packages/create-astro/src/index.ts
@@ -192,7 +192,20 @@ export async function main() {
 		} catch (err: any) {
 			fs.rmdirSync(cwd);
 			if (err.message.includes('404')) {
-				console.error(`Template ${color.underline(options.template)} does not exist!`);
+				console.error(`Could not find template ${color.underline(options.template)}!`);
+				if (isThirdParty) {
+					const hasBranch = options.template.includes('#');
+					if (hasBranch) {
+						console.error('Are you sure this GitHub repo and branch exist?');
+					} else {
+						console.error(
+							`Are you sure this GitHub repo exists?` +
+								`This command uses the ${color.bold('main')} branch by default.\n` +
+								`If the repo doesn't have a main branch, specify a custom branch name:\n` +
+								color.underline(options.template + color.bold('#branch-name'))
+						);
+					}
+				}
 			} else {
 				console.error(err.message);
 			}