From 1735b9b799ae807d8cd9d68a65778de105d92b2b Mon Sep 17 00:00:00 2001 From: ylo878 Date: Sun, 8 Feb 2026 03:37:52 +0200 Subject: [PATCH 1/2] fix: improve Windows compatibility for Makefile and sync tools This PR provides full cross-platform support (Windows/macOS/Linux) for the development environment. Key Changes Makefile: Refactored dev and stop targets using cross-env and kill-port to support PowerShell/CMD. Compatibility: Replaced Unix-specific grep/awk in the help target with a Python one-liner. Bug Fix: Added encoding='utf-8' to tools/sync_vuegraphs.py to prevent charmap decode errors on Windows systems. Dependencies: Added necessary dev-tools to package.json files to ensure a seamless "clone and run" experience. --- Makefile | 15 +++-- frontend/package-lock.json | 129 +++++++------------------------------ frontend/package.json | 1 + package-lock.json | 40 ++++++++++++ package.json | 5 ++ tools/sync_vuegraphs.py | 2 +- 6 files changed, 78 insertions(+), 114 deletions(-) create mode 100644 package-lock.json create mode 100644 package.json diff --git a/Makefile b/Makefile index 73c7e953a..b600f7a3f 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,9 @@ # ============================================================================== .PHONY: dev -dev: server client ## Run both backend and frontend development servers +dev: ## Run both backend and frontend development servers + @$(MAKE) -j2 server client + .PHONY: server server: ## Start the backend server in the background @@ -12,14 +14,14 @@ server: ## Start the backend server in the background .PHONY: client client: ## Start the frontend development server - @cd frontend && VITE_API_BASE_URL=http://localhost:6400 npm run dev + @cd frontend && npx cross-env VITE_API_BASE_URL=http://localhost:6400 npm run dev .PHONY: stop -stop: ## Stop backend and frontend servers +stop: ## Stop backend and frontend servers cross-platform @echo "Stopping backend server (port 6400)..." - @lsof -t -i:6400 | xargs kill -9 2>/dev/null || echo "Backend server not found on port 6400." + @npx kill-port 6400 @echo "Stopping frontend server (port 5173)..." - @lsof -t -i:5173 | xargs kill -9 2>/dev/null || echo "Frontend server not found on port 5173." + @npx kill-port 5173 # ============================================================================== # Tools & Maintenance @@ -39,4 +41,5 @@ validate-yamls: ## Validate all YAML configuration files .PHONY: help help: ## Display this help message - @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' + @python -c "import re; \ + [print(f'{m[0]:<20} {m[1]}') for m in re.findall(r'^([a-zA-Z_-]+):.*?## (.*)$$', open('$(MAKEFILE_LIST)').read(), re.M)]" | sort diff --git a/frontend/package-lock.json b/frontend/package-lock.json index a69edb863..613aefd2e 100755 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -16,14 +16,13 @@ "js-yaml": "^4.1.0", "markdown-it": "^14.1.0", "markdown-it-anchor": "^9.2.0", - "papaparse": "^5.4.1", "vue": "^3.5.22", - "vue-router": "^4.6.0", - "xlsx": "^0.18.5" + "vue-router": "^4.6.0" }, "devDependencies": { "@eslint/js": "^9.39.1", "@vitejs/plugin-vue": "^6.0.1", + "cross-env": "^10.1.0", "eslint": "^9.39.1", "eslint-plugin-vue": "^10.5.1", "globals": "^16.5.0", @@ -76,6 +75,13 @@ "node": ">=6.9.0" } }, + "node_modules/@epic-web/invariant": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@epic-web/invariant/-/invariant-1.0.0.tgz", + "integrity": "sha512-lrTPqgvfFQtR/eY/qkIzp98OGdNJu0m5ji3q/nJI8v3SXkRKEnWiOxMmbvcSoAIzv/cGiuvRy57k4suKQSAdwA==", + "dev": true, + "license": "MIT" + }, "node_modules/@esbuild/aix-ppc64": { "version": "0.27.2", "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.2.tgz", @@ -1431,15 +1437,6 @@ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, - "node_modules/adler-32": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz", - "integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==", - "license": "Apache-2.0", - "engines": { - "node": ">=0.8" - } - }, "node_modules/ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", @@ -1514,19 +1511,6 @@ "node": ">=6" } }, - "node_modules/cfb": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/cfb/-/cfb-1.2.2.tgz", - "integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==", - "license": "Apache-2.0", - "dependencies": { - "adler-32": "~1.3.0", - "crc-32": "~1.2.0" - }, - "engines": { - "node": ">=0.8" - } - }, "node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", @@ -1544,15 +1528,6 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/codepage": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/codepage/-/codepage-1.15.0.tgz", - "integrity": "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==", - "license": "Apache-2.0", - "engines": { - "node": ">=0.8" - } - }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -1580,16 +1555,22 @@ "dev": true, "license": "MIT" }, - "node_modules/crc-32": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz", - "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==", - "license": "Apache-2.0", + "node_modules/cross-env": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-10.1.0.tgz", + "integrity": "sha512-GsYosgnACZTADcmEyJctkJIoqAhHjttw7RsFrVoJNXbsWWqaq6Ym+7kZjq6mS45O0jij6vtiReppKQEtqWy6Dw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@epic-web/invariant": "^1.0.0", + "cross-spawn": "^7.0.6" + }, "bin": { - "crc32": "bin/crc32.njs" + "cross-env": "dist/bin/cross-env.js", + "cross-env-shell": "dist/bin/cross-env-shell.js" }, "engines": { - "node": ">=0.8" + "node": ">=20" } }, "node_modules/cross-spawn": { @@ -2107,15 +2088,6 @@ "dev": true, "license": "ISC" }, - "node_modules/frac": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/frac/-/frac-1.1.2.tgz", - "integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==", - "license": "Apache-2.0", - "engines": { - "node": ">=0.8" - } - }, "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", @@ -2474,12 +2446,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/papaparse": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.5.3.tgz", - "integrity": "sha512-5QvjGxYVjxO59MGU2lHVYpRWBBtKHnlIAcSe1uNFCkkptUh63NFRj0FJQm7nR67puEruUci/ZkjmEFrjCAyP4A==", - "license": "MIT" - }, "node_modules/parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -2704,18 +2670,6 @@ "node": ">=0.10.0" } }, - "node_modules/ssf": { - "version": "0.11.2", - "resolved": "https://registry.npmjs.org/ssf/-/ssf-0.11.2.tgz", - "integrity": "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==", - "license": "Apache-2.0", - "dependencies": { - "frac": "~1.1.2" - }, - "engines": { - "node": ">=0.8" - } - }, "node_modules/strip-json-comments": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", @@ -2949,24 +2903,6 @@ "node": ">= 8" } }, - "node_modules/wmf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wmf/-/wmf-1.0.2.tgz", - "integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==", - "license": "Apache-2.0", - "engines": { - "node": ">=0.8" - } - }, - "node_modules/word": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/word/-/word-0.3.0.tgz", - "integrity": "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==", - "license": "Apache-2.0", - "engines": { - "node": ">=0.8" - } - }, "node_modules/word-wrap": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", @@ -2977,27 +2913,6 @@ "node": ">=0.10.0" } }, - "node_modules/xlsx": { - "version": "0.18.5", - "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.18.5.tgz", - "integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==", - "license": "Apache-2.0", - "dependencies": { - "adler-32": "~1.3.0", - "cfb": "~1.2.1", - "codepage": "~1.15.0", - "crc-32": "~1.2.1", - "ssf": "~0.11.2", - "wmf": "~1.0.1", - "word": "~0.3.0" - }, - "bin": { - "xlsx": "bin/xlsx.njs" - }, - "engines": { - "node": ">=0.8" - } - }, "node_modules/xml-name-validator": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz", diff --git a/frontend/package.json b/frontend/package.json index 536622a11..9e45de633 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -23,6 +23,7 @@ "devDependencies": { "@eslint/js": "^9.39.1", "@vitejs/plugin-vue": "^6.0.1", + "cross-env": "^10.1.0", "eslint": "^9.39.1", "eslint-plugin-vue": "^10.5.1", "globals": "^16.5.0", diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 000000000..e5416e24a --- /dev/null +++ b/package-lock.json @@ -0,0 +1,40 @@ +{ + "name": "ChatDev", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "devDependencies": { + "kill-port": "^2.0.1" + } + }, + "node_modules/get-them-args": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/get-them-args/-/get-them-args-1.3.2.tgz", + "integrity": "sha512-LRn8Jlk+DwZE4GTlDbT3Hikd1wSHgLMme/+7ddlqKd7ldwR6LjJgTVWzBnR01wnYGe4KgrXjg287RaI22UHmAw==", + "dev": true, + "license": "MIT" + }, + "node_modules/kill-port": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/kill-port/-/kill-port-2.0.1.tgz", + "integrity": "sha512-e0SVOV5jFo0mx8r7bS29maVWp17qGqLBZ5ricNSajON6//kmb7qqqNnml4twNE8Dtj97UQD+gNFOaipS/q1zzQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "get-them-args": "1.3.2", + "shell-exec": "1.0.2" + }, + "bin": { + "kill-port": "cli.js" + } + }, + "node_modules/shell-exec": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/shell-exec/-/shell-exec-1.0.2.tgz", + "integrity": "sha512-jyVd+kU2X+mWKMmGhx4fpWbPsjvD53k9ivqetutVW/BQ+WIZoDoP4d8vUMGezV6saZsiNoW2f9GIhg9Dondohg==", + "dev": true, + "license": "MIT" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 000000000..619710d8f --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "devDependencies": { + "kill-port": "^2.0.1" + } +} diff --git a/tools/sync_vuegraphs.py b/tools/sync_vuegraphs.py index 60bb7ee9f..c05b3ddf8 100644 --- a/tools/sync_vuegraphs.py +++ b/tools/sync_vuegraphs.py @@ -37,7 +37,7 @@ def sync_yaml_to_vuegraphs(): try: filename = Path(file_path).stem # simulation_hospital_lmstudio - with open(file_path, "r") as f: + with open(file_path, 'r', encoding='utf-8') as f: content = f.read() # Basic validation to ensure it's a valid YAML From e304939bdb38be5aba4fa510631d89ac6e6c8bf5 Mon Sep 17 00:00:00 2001 From: ylo878 Date: Tue, 10 Feb 2026 14:53:12 +0200 Subject: [PATCH 2/2] Update Makefile Fix make help FileNotFoundError --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b600f7a3f..576aa7fcc 100644 --- a/Makefile +++ b/Makefile @@ -42,4 +42,5 @@ validate-yamls: ## Validate all YAML configuration files .PHONY: help help: ## Display this help message @python -c "import re; \ - [print(f'{m[0]:<20} {m[1]}') for m in re.findall(r'^([a-zA-Z_-]+):.*?## (.*)$$', open('$(MAKEFILE_LIST)').read(), re.M)]" | sort + p=r'$(firstword $(MAKEFILE_LIST))'.strip(); \ + [print(f'{m[0]:<20} {m[1]}') for m in re.findall(r'^([a-zA-Z_-]+):.*?## (.*)$$', open(p, encoding='utf-8').read(), re.M)]" | sort