Removed nondbMakeFile

cmd/program/program.go

@@ -356,20 +356,11 @@ func (p *Project) CreateMainFile() error {
 
 	defer makeFile.Close()
 
-	if p.DBDriver == "sqlite" || p.DBDriver == "none" {
-		// inject makefile template
-		makeFileTemplate := template.Must(template.New("makefile").Parse(string(framework.NonDbMakeFileTemplate())))
-		err = makeFileTemplate.Execute(makeFile, p)
-		if err != nil {
-			return err
-		}
-	} else {
-		// inject makefile template for database excluding sqlite
-		makeFileTemplate := template.Must(template.New("makefile").Parse(string(framework.MakeTemplate())))
-		err = makeFileTemplate.Execute(makeFile, p)
-		if err != nil {
-			return err
-		}
+	// inject makefile template
+	makeFileTemplate := template.Must(template.New("makefile").Parse(string(framework.MakeTemplate())))
+	err = makeFileTemplate.Execute(makeFile, p)
+	if err != nil {
+		return err
 	}
 
 	readmeFile, err := os.Create(filepath.Join(projectPath, "README.md"))

cmd/template/framework/files/makefile.tmpl

@@ -5,14 +5,15 @@ all: build
 
 build:
 	@echo "Building..."
-	{{if .AdvancedOptions.htmx}}@templ generate{{end}}
+	{{if or ( .AdvancedOptions.htmx ) ( .AdvancedOptions.tailwind )}}@templ generate{{end}}
 	{{if .AdvancedOptions.tailwind}}@tailwindcss -i cmd/web/assets/css/input.css -o cmd/web/assets/css/output.css{{end}}
 	@go build -o main cmd/api/main.go
 
 # Run the application
 run:
 	@go run cmd/api/main.go
 
+{{if and (ne .DBDriver "none") (ne .DBDriver "sqlite")}}
 # Create DB container
 docker-run:
 	@if docker compose up 2>/dev/null; then \
@@ -30,6 +31,7 @@ docker-down:
 		echo "Falling back to Docker Compose V1"; \
 		docker-compose down; \
 	fi
+{{end}}
 
 # Test the application
 test:

cmd/template/framework/main.go

@@ -9,9 +9,6 @@ import (
 //go:embed files/main/main.go.tmpl
 var mainTemplate []byte
 
-//go:embed files/nondbMakeFile.tmpl
-var nondbMakeFileTemplate []byte
-
 //go:embed files/air.toml.tmpl
 var airTomlTemplate []byte
 
@@ -43,7 +40,3 @@ func AirTomlTemplate() []byte {
 func ReadmeTemplate() []byte {
 	return readmeTemplate
 }
-
-func NonDbMakeFileTemplate() []byte {
-    return nondbMakeFileTemplate
-}