From 3f569130ab90f24d8d85fdfd63b852c6a5d07b63 Mon Sep 17 00:00:00 2001 From: mlogclub Date: Thu, 16 Apr 2026 18:19:16 +0800 Subject: [PATCH] refactor: update Makefile to include widget run command and install dependencies for dashboard and widget --- Makefile | 21 +++++++++++++++++---- dashboard/package.json | 2 +- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index cde3730..70b9f44 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: run run-server run-dashboard build build-all build-assets build-dashboard build-widget \ +.PHONY: install run run-server run-dashboard run-widget build build-all build-assets build-dashboard build-widget \ package-current package-platform build-server-linux-amd64 clean-dist clean-temp test tidy generator enums migration testdata DIST_DIR ?= dist @@ -13,21 +13,31 @@ CURRENT_GOARCH := $(shell go env GOARCH) CURRENT_PLATFORM := $(CURRENT_GOOS)-$(CURRENT_GOARCH) PLATFORM ?= $(CURRENT_PLATFORM) +install: + go mod download + cd dashboard && pnpm install + cd widget && pnpm install + @echo "[install] done" + run: @server_pid=0; \ dashboard_pid=0; \ - trap 'kill $$server_pid $$dashboard_pid 2>/dev/null || true' INT TERM EXIT; \ + widget_pid=0; \ + trap 'kill $$server_pid $$dashboard_pid $$widget_pid 2>/dev/null || true' INT TERM EXIT; \ $(MAKE) run-server & \ server_pid=$$!; \ $(MAKE) run-dashboard & \ dashboard_pid=$$!; \ - while kill -0 $$server_pid 2>/dev/null && kill -0 $$dashboard_pid 2>/dev/null; do \ + $(MAKE) run-widget & \ + widget_pid=$$!; \ + while kill -0 $$server_pid 2>/dev/null && kill -0 $$dashboard_pid 2>/dev/null && kill -0 $$widget_pid 2>/dev/null; do \ sleep 1; \ done; \ status=0; \ wait $$server_pid || status=$$?; \ wait $$dashboard_pid || status=$$?; \ - kill $$server_pid $$dashboard_pid 2>/dev/null || true; \ + wait $$widget_pid || status=$$?; \ + kill $$server_pid $$dashboard_pid $$widget_pid 2>/dev/null || true; \ exit $$status run-server: @@ -36,6 +46,9 @@ run-server: run-dashboard: cd dashboard && pnpm dev +run-widget: + cd widget && pnpm dev + build: clean-dist build-assets package-current clean-temp @echo "[build] done" diff --git a/dashboard/package.json b/dashboard/package.json index b1f5e18..3163439 100644 --- a/dashboard/package.json +++ b/dashboard/package.json @@ -1,5 +1,5 @@ { - "name": "web", + "name": "dashboard", "version": "0.1.0", "private": true, "scripts": {