commands: Create default archetype on new site

See #3626

2 files changed, 12 insertions, 5 deletions

diff --git a/commands/new.go b/commands/new.go
index a7243c0a6..de922fc0d 100644
--- a/commands/new.go
+++ b/commands/new.go
@@ -152,10 +152,11 @@ func NewContent(cmd *cobra.Command, args []string) error {
 }
 
 func doNewSite(fs *hugofs.Fs, basepath string, force bool) error {
+	archeTypePath := filepath.Join(basepath, "archetypes")
 	dirs := []string{
 		filepath.Join(basepath, "layouts"),
 		filepath.Join(basepath, "content"),
-		filepath.Join(basepath, "archetypes"),
+		archeTypePath,
 		filepath.Join(basepath, "static"),
 		filepath.Join(basepath, "data"),
 		filepath.Join(basepath, "themes"),
@@ -190,6 +191,10 @@ func doNewSite(fs *hugofs.Fs, basepath string, force bool) error {
 
 	createConfig(fs, basepath, configFormat)
 
+	// Create a defaul archetype file.
+	helpers.SafeWriteToDisk(filepath.Join(archeTypePath, "default.md"),
+		strings.NewReader(create.ArchetypeTemplateTemplate), fs.Source)
+
 	jww.FEEDBACK.Printf("Congratulations! Your new Hugo site is created in %s.\n\n", basepath)
 	jww.FEEDBACK.Println(nextStepsText())
 
diff --git a/create/content_template_handler.go b/create/content_template_handler.go
index d8c1fc71c..fbe062cba 100644
--- a/create/content_template_handler.go
+++ b/create/content_template_handler.go
@@ -48,11 +48,13 @@ type ArchetypeFileData struct {
 }
 
 const (
-	archetypeTemplateTemplate = `---
+	ArchetypeTemplateTemplate = `---
 title: "{{ replace .TranslationBaseName "-" " " | title }}"
 date: {{ .Date }}
 draft: true
----`
+---
+
+`
 )
 
 func executeArcheTypeAsTemplate(s *hugolib.Site, kind, targetPath, archetypeFilename string) ([]byte, error) {
@@ -75,7 +77,7 @@ func executeArcheTypeAsTemplate(s *hugolib.Site, kind, targetPath, archetypeFile
 
 	if archetypeFilename == "" {
 		// TODO(bep) archetype revive the issue about wrong tpl funcs arg order
-		archetypeTemplate = []byte(archetypeTemplateTemplate)
+		archetypeTemplate = []byte(ArchetypeTemplateTemplate)
 	} else {
 		archetypeTemplate, err = afero.ReadFile(s.Fs.Source, archetypeFilename)
 		if err != nil {
@@ -105,7 +107,7 @@ func executeArcheTypeAsTemplate(s *hugolib.Site, kind, targetPath, archetypeFile
 		s.Log.FEEDBACK.Println(fmt.Sprintf(`WARNING: date and/or title missing from archetype file %q. 
 From Hugo 0.24 this must be provided in the archetype file itself, if needed. Example:
 %s
-`, archetypeFilename, archetypeTemplateTemplate))
+`, archetypeFilename, ArchetypeTemplateTemplate))
 
 	}