Skip to content

fix: Add build js command to makefile serve commands #4035

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
crivetimihai merged 3 commits into from
Apr 5, 2026
Merged

fix: Add build js command to makefile serve commands #4035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cce8c70
fix: Add build js command to makefile serve commands
gcgoncalves Apr 3, 2026
93b8fd9
fix: add js-build dep to dev-echo, update secrets baseline
crivetimihai Apr 5, 2026
a35141a
fix: make js-build graceful when npm is not available
crivetimihai Apr 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .secrets.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"files": "package-lock.json|Cargo.lock|^.secrets.baseline$|scripts/sign_image.sh|scripts/zap|sonar-project.properties|^/Users/brian/dev/github.ibm.com/contextforge-org/sps-pipeline-config/.secrets.baseline$|^./.secrets.baseline$",
"lines": null
},
"generated_at": "2026-04-05T09:07:27Z",
"generated_at": "2026-04-05T22:25:30Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down Expand Up @@ -344,79 +344,79 @@
"hashed_secret": "844c398e469ef3fb919da3778944365ab2175fb7",
"is_secret": false,
"is_verified": false,
"line_number": 368,
"line_number": 374,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "319037749ce37e577db0b3628c7f90e333544391",
"is_secret": false,
"is_verified": false,
"line_number": 792,
"line_number": 798,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "6ae2832e494d1098e8901fe156083e39399a24f1",
"is_secret": false,
"is_verified": false,
"line_number": 794,
"line_number": 800,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "43fc45734b96bcb1b6cef373e949eb3524ae199b",
"is_secret": false,
"is_verified": false,
"line_number": 1485,
"line_number": 1491,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "9d989e8d27dc9e0ec3389fc855f142c3d40f0c50",
"is_secret": false,
"is_verified": false,
"line_number": 1695,
"line_number": 1701,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "d3ac7a4ef1a838b4134f2f6e7f3c0d249d74b674",
"is_secret": false,
"is_verified": false,
"line_number": 6075,
"line_number": 6081,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "5932862bcd24dd27d0dc0407ec94fe9d6ea24aeb",
"is_secret": false,
"is_verified": false,
"line_number": 6572,
"line_number": 6578,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "c77c805e32f173e4321ee9187de9c29cb3804513",
"is_secret": false,
"is_verified": false,
"line_number": 6584,
"line_number": 6590,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "8fe3df8a68ddd0d4ab2214186cbb8e38ccd0e06a",
"is_secret": false,
"is_verified": false,
"line_number": 6656,
"line_number": 6662,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "93ac8946882128457cd9e283b30ca851945e6690",
"is_secret": false,
"is_verified": false,
"line_number": 7759,
"line_number": 7765,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down
29 changes: 19 additions & 10 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,36 +255,45 @@ check-env-dev:
# help: run - Execute helper script ./run.sh

.PHONY: serve serve-ssl serve-granian serve-granian-ssl serve-granian-http2 dev dev-remote stop stop-dev stop-serve run \
certs certs-jwt certs-jwt-ecdsa certs-all certs-mcp-ca certs-mcp-gateway certs-mcp-plugin certs-mcp-all certs-mcp-check
certs certs-jwt certs-jwt-ecdsa certs-all certs-mcp-ca certs-mcp-gateway certs-mcp-plugin certs-mcp-all certs-mcp-check \
js-build

## --- JS build ----------------------------------------------------------------
js-build: ## Install npm dependencies and build JS bundle with Vite
@if command -v npm >/dev/null 2>&1; then \
npm install --no-audit --no-fund && npm run vite:build; \
else \
echo "WARNING: npm not found — skipping JS bundle build (admin UI may not load)"; \
fi

## --- Primary servers ---------------------------------------------------------
serve: ## Run production server with Gunicorn + Uvicorn (default)
serve: js-build ## Run production server with Gunicorn + Uvicorn (default)
./run-gunicorn.sh

serve-ssl: certs ## Run Gunicorn with TLS enabled
serve-ssl: js-build certs ## Run Gunicorn with TLS enabled
SSL=true CERT_FILE=certs/cert.pem KEY_FILE=certs/key.pem ./run-gunicorn.sh

serve-granian: ## Run production server with Granian (Rust-based, alternative)
serve-granian: js-build ## Run production server with Granian (Rust-based, alternative)
./run-granian.sh

serve-granian-ssl: certs ## Run Granian with TLS enabled
serve-granian-ssl: js-build certs ## Run Granian with TLS enabled
SSL=true CERT_FILE=certs/cert.pem KEY_FILE=certs/key.pem ./run-granian.sh

serve-granian-http2: certs ## Run Granian with HTTP/2 and TLS
serve-granian-http2: js-build certs ## Run Granian with HTTP/2 and TLS
SSL=true GRANIAN_HTTP=2 CERT_FILE=certs/cert.pem KEY_FILE=certs/key.pem ./run-granian.sh

dev:
dev: js-build
@TEMPLATES_AUTO_RELOAD=true $(VENV_DIR)/bin/uvicorn mcpgateway.main:app --host 0.0.0.0 --port 8000 --reload --reload-exclude='public/'

.PHONY: dev-echo
dev-echo: ## Run dev server with SQL query logging enabled
dev-echo: js-build ## Run dev server with SQL query logging enabled
@echo "🔍 Starting dev server with SQL query logging (N+1 detection)"
@echo " Docs: docs/docs/development/db-performance.md"
@SQLALCHEMY_ECHO=true TEMPLATES_AUTO_RELOAD=true $(VENV_DIR)/bin/uvicorn mcpgateway.main:app --host 0.0.0.0 --port 8000 --reload --reload-exclude='public/'

dev-remote: DEBUG_IP = 127.0.0.1
dev-remote: DEBUG_WAIT = --wait-for-client
dev-remote: ## Run dev server with remote debugging (debugpy on port 5678, remote: make dev-remote DEBUG_IP=0.0.0.0 DEBUG_WAIT=)
dev-remote: js-build ## Run dev server with remote debugging (debugpy on port 5678, remote: make dev-remote DEBUG_IP=0.0.0.0 DEBUG_WAIT=)
@TEMPLATES_AUTO_RELOAD=true $(VENV_DIR)/bin/python -m debugpy \
--listen $(DEBUG_IP):5678 \
$(DEBUG_WAIT) \
Expand All @@ -306,7 +315,7 @@ stop-serve: ## Stop gunicorn production server (port 4444)
@if [ -f /tmp/mcpgateway-gunicorn.lock ]; then kill -9 $$(cat /tmp/mcpgateway-gunicorn.lock) 2>/dev/null || true; rm -f /tmp/mcpgateway-gunicorn.lock; fi
@lsof -ti:4444 2>/dev/null | xargs -r kill -9 || true

run:
run: js-build
./run.sh

## --- Certificate helper ------------------------------------------------------
Expand Down
Loading