Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

chore: make pnpm dev start local builder stack (#5853)

Oleg Isonen81363861615c
diff --git a/apps/builder/dev/backend.sh b/apps/builder/dev/backend.sh
index 04a6bdf2ab..68f5b6e222 100644
--- a/apps/builder/dev/backend.sh
+++ b/apps/builder/dev/backend.sh
@@ -31,6 +31,27 @@ builder_backend_start_postgrest() {
builder_compose up -d postgrest
}
+builder_backend_wait_for_postgrest() {
+ local timeout_seconds="${1:-60}"
+ local port
+ port="$(builder_compose port postgrest 3000)"
+ local url="http://127.0.0.1:${port##*:}/UserProduct?select=userId&limit=0"
+ local timeout_at
+ timeout_at="$(($(date +%s) + timeout_seconds))"
+
+ until {
+ local status
+ status="$(curl -s -o /dev/null -w "%{http_code}" "$url" || true)"
+ [ "$status" -ge 200 ] && [ "$status" -lt 500 ]
+ }; do
+ if [ "$(date +%s)" -ge "$timeout_at" ]; then
+ echo "Timed out waiting for PostgREST" >&2
+ return 1
+ fi
+ sleep 0.2
+ done
+}
+
builder_backend_wait_for_db() {
local timeout_seconds="${1:-60}"
local timeout_at
diff --git a/apps/builder/dev/run-local.sh b/apps/builder/dev/run-local.sh
index 7d7a761060..b39ac4c1a9 100755
--- a/apps/builder/dev/run-local.sh
+++ b/apps/builder/dev/run-local.sh
@@ -7,7 +7,7 @@ source "$ROOT_DIR/apps/builder/dev/backend.sh"
builder_backend_init
cleanup() {
- if [ "${LOCAL_DEV_CLEANUP:-false}" != "true" ]; then
+ if [ "${LOCAL_DEV_CLEANUP:-${LOCAL_DEV_START_BUILDER:-true}}" != "true" ]; then
return
fi
@@ -29,7 +29,8 @@ builder_backend_wait_for_db
builder_backend_bootstrap_if_empty
builder_generate_prisma_client auto
builder_backend_start_postgrest
+builder_backend_wait_for_postgrest
if [ "${LOCAL_DEV_START_BUILDER:-true}" = "true" ]; then
- exec pnpm --dir "$ROOT_DIR" dev
+ pnpm --dir "$ROOT_DIR" --filter=@webstudio-is/builder dev
fi
diff --git a/package.json b/package.json
index 03c8f59302..075655c252 100644
--- a/package.json
+++ b/package.json
@@ -7,10 +7,7 @@
"scripts": {
"build": "pnpm -r --filter='!./fixtures/*' build",
"dts": "pnpm -r dts",
- "dev": "pnpm --filter='@webstudio-is/builder' dev",
- "dev:local": "bash ./apps/builder/dev/run-local.sh",
- "dev:backend": "LOCAL_DEV_START_BUILDER=false bash ./apps/builder/dev/run-local.sh",
- "dev:local:reset": "LOCAL_DEV_RESET_DB=true bash ./apps/builder/dev/run-local.sh",
+ "dev": "bash ./apps/builder/dev/run-local.sh",
"lint": "oxlint --deny-warnings",
"fixtures": "pnpm -r fixtures:link && pnpm -r fixtures:sync && pnpm -r fixtures:build",
"checks": "pnpm -r test && pnpm -r typecheck && pnpm lint && pnpm fixtures",