From 9a8c84d6000fab3ec6847a330c45bfe24b76265d Mon Sep 17 00:00:00 2001
From: Joe Mooring <joe.mooring@veriphor.com>
Date: Wed, 23 Aug 2023 06:33:37 -0700
Subject: [PATCH] create/skeletons: Move theme's site config to top level

Closes #11380
---
 .../skeletons/theme/config/_default/hugo.toml |  4 ----
 .../theme/config/_default/menus.toml          | 14 -----------
 create/skeletons/theme/hugo.toml              | 23 +++++++++++++++++++
 testscripts/commands/new.txt                  |  3 +--
 4 files changed, 24 insertions(+), 20 deletions(-)
 delete mode 100644 create/skeletons/theme/config/_default/hugo.toml
 delete mode 100644 create/skeletons/theme/config/_default/menus.toml
 create mode 100644 create/skeletons/theme/hugo.toml

diff --git a/create/skeletons/theme/config/_default/hugo.toml b/create/skeletons/theme/config/_default/hugo.toml
deleted file mode 100644
index 123719411..000000000
--- a/create/skeletons/theme/config/_default/hugo.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-[module]
-  [module.hugoVersion]
-    extended = false
-    min = "0.116.0"
diff --git a/create/skeletons/theme/config/_default/menus.toml b/create/skeletons/theme/config/_default/menus.toml
deleted file mode 100644
index 526645f2c..000000000
--- a/create/skeletons/theme/config/_default/menus.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-[[main]]
-name = 'Home'
-pageRef = '/'
-weight = 10
-
-[[main]]
-name = 'Posts'
-pageRef = '/posts'
-weight = 20
-
-[[main]]
-name = 'Tags'
-pageRef = '/tags'
-weight = 30
diff --git a/create/skeletons/theme/hugo.toml b/create/skeletons/theme/hugo.toml
new file mode 100644
index 000000000..890e58deb
--- /dev/null
+++ b/create/skeletons/theme/hugo.toml
@@ -0,0 +1,23 @@
+baseURL = 'https://example.org/'
+languageCode = 'en-us'
+title = 'My New Hugo Site'
+
+[[menus.main]]
+name = 'Home'
+pageRef = '/'
+weight = 10
+
+[[menus.main]]
+name = 'Posts'
+pageRef = '/posts'
+weight = 20
+
+[[menus.main]]
+name = 'Tags'
+pageRef = '/tags'
+weight = 30
+
+[module]
+  [module.hugoVersion]
+    extended = false
+    min = "0.116.0"
diff --git a/testscripts/commands/new.txt b/testscripts/commands/new.txt
index 955841fda..f44aaca20 100644
--- a/testscripts/commands/new.txt
+++ b/testscripts/commands/new.txt
@@ -26,8 +26,6 @@ cd mytheme
 checkfile archetypes/default.md
 checkfile assets/css/main.css
 checkfile assets/js/main.js
-checkfile config/_default/hugo.toml
-checkfile config/_default/menus.toml
 checkfile content/_index.md
 checkfile content/posts/_index.md
 checkfile content/posts/post-1.md
@@ -48,6 +46,7 @@ checkfile layouts/partials/terms.html
 checkfile static/favicon.ico
 checkfile LICENSE
 checkfile README.md
+checkfile hugo.toml
 checkfile theme.toml
 exists data
 exists i18n