First merge from develop to main (WIP) #7

Merged
sugar merged 199 commits from develop into main 2026-01-27 17:47:07 +00:00
Showing only changes of commit 64bab332c9 - Show all commits

View File

@@ -9,7 +9,9 @@ client_cms_dir := join(client_dir, "cms")
server_exec_path := join(output_dir, project_name) server_exec_path := join(output_dir, project_name)
server_entry := "main.go" server_entry := "main.go"
install: install-cms install: install-cms install-back
generate: gen-back
install-cms: install-cms:
cd {{ client_cms_dir }} && {{ pnpm_cmd }} install cd {{ client_cms_dir }} && {{ pnpm_cmd }} install
@@ -24,6 +26,9 @@ build-client-cms:
build-back: build-back:
{{ go_cmd }} build -o {{ server_exec_path }}{{ if os() == "windows" { ".exe" } else { "" } }} {{ server_entry }} {{ go_cmd }} build -o {{ server_exec_path }}{{ if os() == "windows" { ".exe" } else { "" } }} {{ server_entry }}
install-back:
cd {{ project_dir }} && go mod tidy
run-back: run-back:
cd {{ output_dir }} && CONFIG_PATH={{ output_dir }} {{ server_exec_path }}{{ if os() == "windows" { ".exe" } else { "" } }} cd {{ output_dir }} && CONFIG_PATH={{ output_dir }} {{ server_exec_path }}{{ if os() == "windows" { ".exe" } else { "" } }}
@@ -36,7 +41,7 @@ gen-back:
watch-back: watch-back:
watchexec -r -e go,yaml,tpl -i '.devenv/**' -i '.direnv/**' -i 'client/**' -i 'vendor/**' 'go build -o {{ server_exec_path }} . && cd {{ output_dir }} && CONFIG_PATH={{ output_dir }} {{ server_exec_path }}' watchexec -r -e go,yaml,tpl -i '.devenv/**' -i '.direnv/**' -i 'client/**' -i 'vendor/**' 'go build -o {{ server_exec_path }} . && cd {{ output_dir }} && CONFIG_PATH={{ output_dir }} {{ server_exec_path }}'
dev: clean install gen-back dev: clean install generate
devenv up --verbose devenv up --verbose
dev-client-cms: install-cms dev-client-cms: install-cms