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.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
chore: Change the local setup to use docker only for supabase (#5851)
Oleg Isonena515a4fcbf8b
diff --git a/.github/workflows/main.yml b/.github/workflows/main.ymlindex a4375c8219..4082d11f70 100644--- a/.github/workflows/main.yml+++ b/.github/workflows/main.yml@@ -172,14 +172,7 @@ jobs:name: developmentenv:- AUTH_SECRET: test- DATABASE_URL: postgresql://user:pass@localhost:55432/webstudio- DIRECT_URL: postgresql://user:pass@localhost:55432/webstudio- E2E_PGPORT: 55432- E2E_POSTGREST_PORT: 55433- POSTGREST_API_KEY: ""- POSTGREST_URL: http://127.0.0.1:55433- TRPC_SERVER_API_TOKEN: e2e-service-token+ BUILDER_E2E_COMPOSE_ARGS: "--env-file apps/builder/.env -f apps/builder/docker-compose.yaml -f apps/builder/docker-compose.e2e.yaml"steps:- uses: actions/checkout@v4@@ -217,15 +210,15 @@ jobs:fiecho "::warning::Builder e2e failed on the first attempt. Restarting services and retrying once."- docker compose -f apps/builder/docker-compose.e2e.yaml logs || true- docker compose -f apps/builder/docker-compose.e2e.yaml down --volumes --remove-orphans || true+ docker compose $BUILDER_E2E_COMPOSE_ARGS logs || true+ docker compose $BUILDER_E2E_COMPOSE_ARGS down --volumes --remove-orphans || trueE2E_SKIP_CLEANUP=true E2E_TEST_COMMAND_TIMEOUT_SECONDS=900 pnpm e2e:builder- name: Print e2e service logsif: failure()- run: docker compose -f apps/builder/docker-compose.e2e.yaml logs+ run: docker compose $BUILDER_E2E_COMPOSE_ARGS logs- name: Stop e2e servicesif: always()- run: docker compose -f apps/builder/docker-compose.e2e.yaml down --volumes --remove-orphans+ run: docker compose $BUILDER_E2E_COMPOSE_ARGS down --volumes --remove-orphansdiff --git a/.gitignore b/.gitignoreindex 9e965a99dc..eea1d5784c 100644--- a/.gitignore+++ b/.gitignore@@ -39,6 +39,7 @@ yarn-error.log*# data/data+.webstudio*.db*.db-journaldiff --git a/apps/builder/.env b/apps/builder/.envindex c5eb8e04c1..0a25a02949 100644--- a/apps/builder/.env+++ b/apps/builder/.env@@ -1,17 +1,23 @@# To override environment variables, add a .env.development file in the same directory.# For more details, visit: https://vitejs.dev/guide/env-and-mode#env-files-DATABASE_URL=postgresql://postgres:pass@localhost/webstudio?pgbouncer=true-DIRECT_URL=postgresql://postgres:pass@localhost/webstudio+DATABASE_URL=postgresql://postgres:pass@localhost:55432/webstudio?pgbouncer=true+DIRECT_URL=postgresql://postgres:pass@localhost:55432/webstudio+PGPORT=55432+POSTGRES_DB=webstudio+POSTGRES_USER=postgres+POSTGRES_PASSWORD=passAUTH_SECRET=0000+PORT=5176# GH_CLIENT_SECRET=# GH_CLIENT_ID=DEV_LOGIN=true-POSTGREST_URL=http://localhost:3000-# JWT token, decode using jwt.io. Encoded with PGRST_JWT_SECRET from docker-compose.yml-POSTGREST_API_KEY="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImttZHBpeHpvcWlpcmJtcGRpcHB5Iiwicm9sZSI6ImFub24iLCJpYXQiOjE2NjYzMzY0MjgsImV4cCI6MTk4MTkxMjQyOH0.jjeYvTDrWP9pV7dfZr6fptualNQ3aR13kuPhvT25Sso"+POSTGREST_URL=http://localhost:55433+POSTGREST_PORT=55433+# Empty for the local PostgREST container.+POSTGREST_API_KEY=# Optional max upload size in Mb# MAX_UPLOAD_SIZE=10@@ -84,6 +90,4 @@ PLANS='[# TRCP server url and API token. If empty local TRPC server is used# TRPC_SERVER_URL=-# TRPC_SERVER_API_TOKEN=--+TRPC_SERVER_API_TOKEN=e2e-service-tokendiff --git a/apps/builder/dev/backend.sh b/apps/builder/dev/backend.shnew file mode 100644index 0000000000..04a6bdf2ab--- /dev/null+++ b/apps/builder/dev/backend.sh@@ -0,0 +1,135 @@+#!/usr/bin/env bash++builder_backend_init() {+ ROOT_DIR="${ROOT_DIR:-$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)}"+ SCHEMA_SNAPSHOT="${SCHEMA_SNAPSHOT:-$ROOT_DIR/apps/builder/e2e/schema/current.sql}"+ COMPOSE_ENV=(+ --env-file "$ROOT_DIR/apps/builder/.env"+ )+ if [ -f "$ROOT_DIR/apps/builder/.env.development" ]; then+ COMPOSE_ENV+=(--env-file "$ROOT_DIR/apps/builder/.env.development")+ fi+ COMPOSE_FILES=(+ -f "$ROOT_DIR/apps/builder/docker-compose.yaml"+ -f "$COMPOSE_OVERRIDE_FILE"+ )+}++builder_compose() {+ docker compose "${COMPOSE_ENV[@]}" "${COMPOSE_FILES[@]}" "$@"+}++builder_backend_down() {+ builder_compose down "$@"+}++builder_backend_start_db() {+ builder_compose up -d db+}++builder_backend_start_postgrest() {+ builder_compose up -d postgrest+}++builder_backend_wait_for_db() {+ local timeout_seconds="${1:-60}"+ local timeout_at+ timeout_at="$(($(date +%s) + timeout_seconds))"++ until builder_compose exec -T db \+ sh -c 'psql -q -U "$POSTGRES_USER" -d "$POSTGRES_DB" -v ON_ERROR_STOP=1 -c "SELECT 1"' \+ >/dev/null 2>&1; do+ if [ "$(date +%s)" -ge "$timeout_at" ]; then+ echo "Timed out waiting for database" >&2+ return 1+ fi+ sleep 0.2+ done+}++builder_backend_schema_exists() {+ [ "$(+ builder_compose exec -T db \+ sh -c 'psql -q -U "$POSTGRES_USER" -d "$POSTGRES_DB" -tAc "SELECT to_regclass('\''public.\"Project\"'\'') IS NOT NULL"'+ )" = "t" ]+}++builder_backend_bootstrap_schema_snapshot() {+ if [ ! -f "$SCHEMA_SNAPSHOT" ]; then+ return 1+ fi++ builder_compose exec -T db \+ sh -c 'psql -q -U "$POSTGRES_USER" -d "$POSTGRES_DB" -v ON_ERROR_STOP=1' \+ <"$SCHEMA_SNAPSHOT" >/dev/null+}++builder_backend_migrate() {+ pnpm --dir "$ROOT_DIR" --filter=./packages/prisma-client migrations migrate --dev --cwd ../../apps/builder+}++builder_backend_bootstrap() {+ case "${1:-auto}" in+ schema)+ builder_backend_bootstrap_schema_snapshot+ ;;+ migrations)+ builder_backend_migrate+ ;;+ auto)+ if [ -f "$SCHEMA_SNAPSHOT" ]; then+ builder_backend_bootstrap_schema_snapshot+ echo "Bootstrapped database from $SCHEMA_SNAPSHOT"+ else+ echo "No schema snapshot found at $SCHEMA_SNAPSHOT; falling back to migrations"+ builder_backend_migrate+ fi+ ;;+ *)+ echo "Unknown database bootstrap mode: $1" >&2+ exit 1+ ;;+ esac+}++builder_backend_bootstrap_if_empty() {+ if builder_backend_schema_exists; then+ echo "Database schema already exists; skipping bootstrap"+ else+ builder_backend_bootstrap auto+ fi+}++builder_backend_write_schema_snapshot() {+ mkdir -p "$(dirname "$SCHEMA_SNAPSHOT")"+ builder_compose exec -T db \+ sh -c 'pg_dump -U "$POSTGRES_USER" -d "$POSTGRES_DB" --schema-only --no-owner --no-privileges' \+ >"$SCHEMA_SNAPSHOT"+ echo "Wrote $SCHEMA_SNAPSHOT"+}++builder_prisma_client_exists() {+ [ -f "$ROOT_DIR/packages/prisma-client/src/__generated__/index.js" ]+}++builder_generate_prisma_client() {+ case "${1:-auto}" in+ true)+ pnpm --dir "$ROOT_DIR" --filter=@webstudio-is/prisma-client generate+ ;;+ false)+ echo "Skipping Prisma client generation"+ ;;+ auto)+ if builder_prisma_client_exists; then+ echo "Skipping Prisma client generation; generated client already exists"+ else+ pnpm --dir "$ROOT_DIR" --filter=@webstudio-is/prisma-client generate+ fi+ ;;+ *)+ echo "Unknown Prisma generation mode: $1" >&2+ exit 1+ ;;+ esac+}diff --git a/apps/builder/dev/run-local.sh b/apps/builder/dev/run-local.shnew file mode 100755index 0000000000..7d7a761060--- /dev/null+++ b/apps/builder/dev/run-local.sh@@ -0,0 +1,35 @@+#!/usr/bin/env bash+set -euo pipefail++ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"+COMPOSE_OVERRIDE_FILE="$ROOT_DIR/apps/builder/docker-compose.local.yaml"+source "$ROOT_DIR/apps/builder/dev/backend.sh"+builder_backend_init++cleanup() {+ if [ "${LOCAL_DEV_CLEANUP:-false}" != "true" ]; then+ return+ fi++ local down_args=(--remove-orphans)+ if [ "${LOCAL_DEV_CLEANUP_VOLUMES:-false}" = "true" ]; then+ down_args+=(--volumes)+ fi+ builder_backend_down "${down_args[@]}"+}++trap cleanup EXIT++if [ "${LOCAL_DEV_RESET_DB:-false}" = "true" ]; then+ builder_backend_down --volumes --remove-orphans+fi++builder_backend_start_db+builder_backend_wait_for_db+builder_backend_bootstrap_if_empty+builder_generate_prisma_client auto+builder_backend_start_postgrest++if [ "${LOCAL_DEV_START_BUILDER:-true}" = "true" ]; then+ exec pnpm --dir "$ROOT_DIR" dev+fidiff --git a/apps/builder/docker-compose.e2e.yaml b/apps/builder/docker-compose.e2e.yamlindex 18bb243e30..5583cbe14f 100644--- a/apps/builder/docker-compose.e2e.yaml+++ b/apps/builder/docker-compose.e2e.yaml@@ -1,29 +1,4 @@services:db:- image: postgres:16- environment:- POSTGRES_DB: webstudio- POSTGRES_USER: user- POSTGRES_PASSWORD: pass- ports:- - "${E2E_PGPORT:-55432}:5432"tmpfs:- /var/lib/postgresql/data- healthcheck:- test: ["CMD-SHELL", "pg_isready -U user -d webstudio"]- interval: 2s- timeout: 2s- retries: 30-- postgrest:- image: postgrest/postgrest:v12.2.12- depends_on:- db:- condition: service_healthy- environment:- PGRST_DB_URI: postgres://user:pass@db:5432/webstudio- PGRST_DB_SCHEMAS: public- PGRST_DB_ANON_ROLE: user- PGRST_SERVER_PORT: 3000- ports:- - "${E2E_POSTGREST_PORT:-55433}:3000"diff --git a/apps/builder/docker-compose.local.yaml b/apps/builder/docker-compose.local.yamlnew file mode 100644index 0000000000..61ea53ff45--- /dev/null+++ b/apps/builder/docker-compose.local.yaml@@ -0,0 +1,7 @@+services:+ db:+ volumes:+ - db:/var/lib/postgresql/data++volumes:+ db:diff --git a/apps/builder/docker-compose.yaml b/apps/builder/docker-compose.yamlindex 349952e4e1..c5578e7cbb 100644--- a/apps/builder/docker-compose.yaml+++ b/apps/builder/docker-compose.yaml@@ -1,20 +1,27 @@-version: "3.1"--volumes:- db:-services:db:- image: postgres- # Uncomment to log all queries- command: ["postgres", "-c", "log_statement=all"]- restart: always+ image: postgres:16+ environment:+ POSTGRES_DB: ${POSTGRES_DB:?}+ POSTGRES_USER: ${POSTGRES_USER:?}+ POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}+ ports:+ - "${PGPORT:?}:5432"+ healthcheck:+ test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]+ interval: 2s+ timeout: 2s+ retries: 30++ postgrest:+ image: postgrest/postgrest:v12.2.12+ depends_on:+ db:+ condition: service_healthyenvironment:- # postgresql://user:pass@localhost:5432/webstudio- POSTGRES_PASSWORD: pass- POSTGRES_DB: webstudio- POSTGRES_USER: user- volumes:- - db:/var/lib/postgresql/data+ PGRST_DB_URI: postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB}+ PGRST_DB_SCHEMAS: public+ PGRST_DB_ANON_ROLE: ${POSTGRES_USER}+ PGRST_SERVER_PORT: 3000ports:- - ${PGPORT:-5432}:5432+ - "${POSTGREST_PORT:?}:3000"diff --git a/apps/builder/e2e/db.ts b/apps/builder/e2e/db.tsindex 095393b508..6ee4270dc6 100644--- a/apps/builder/e2e/db.ts+++ b/apps/builder/e2e/db.ts@@ -5,16 +5,18 @@ import {createClient,type Database,} from "@webstudio-is/postgrest/index.server";+import env from "../app/env/env.server";const execFileAsync = promisify(execFile);-const postgrestUrl = process.env.POSTGREST_URL ?? "http://127.0.0.1:55433";-const postgrestApiKey = process.env.POSTGREST_API_KEY ?? "";+const composeBaseFile = fileURLToPath(+ new URL("../docker-compose.yaml", import.meta.url)+);const composeFile = fileURLToPath(new URL("../docker-compose.e2e.yaml", import.meta.url));-const postgrest = createClient(postgrestUrl, postgrestApiKey);+const postgrest = createClient(env.POSTGREST_URL, env.POSTGREST_API_KEY);const throwIfError = <Data>({error,@@ -55,18 +57,16 @@ export const resetDatabase = async () => {["compose","-f",+ composeBaseFile,+ "-f",composeFile,"exec","-T","db",- "psql",- "-U",- "user",- "-d",- "webstudio",- "-v",- "ON_ERROR_STOP=1",+ "sh","-c",+ 'psql -U "$POSTGRES_USER" -d "$POSTGRES_DB" -v ON_ERROR_STOP=1 -c "$1"',+ "sh",sql,],{ maxBuffer: 1024 * 1024 }diff --git a/apps/builder/e2e/flows/dashboard.ts b/apps/builder/e2e/flows/dashboard.tsindex 28566f6b9d..82d4566f94 100644--- a/apps/builder/e2e/flows/dashboard.ts+++ b/apps/builder/e2e/flows/dashboard.ts@@ -1,5 +1,6 @@import { dashboardUrl, getProjectIdFromBuilderUrl } from "../harness";import type { Page } from "playwright";+import env from "../../app/env/env.server";const loginReadyTimeout = 30_000;@@ -48,7 +49,10 @@ export const loginWithSecret = async ({return;}await loginWithSecretButton.click();- await page.getByPlaceholder("Auth secret").fill("test");+ if (env.AUTH_SECRET === undefined) {+ throw new Error("AUTH_SECRET must be set for e2e dev login");+ }+ await page.getByPlaceholder("Auth secret").fill(env.AUTH_SECRET);await page.getByPlaceholder("Email (optional)").fill(email);if (devPlan !== undefined) {await page.locator('select[name="devPlan"]').selectOption(devPlan);diff --git a/apps/builder/e2e/harness.ts b/apps/builder/e2e/harness.tsindex cef493f49d..1aa1b1c265 100644--- a/apps/builder/e2e/harness.ts+++ b/apps/builder/e2e/harness.ts@@ -6,10 +6,9 @@ import {type BrowserContext,type BrowserContextOptions,} from "playwright";+import env from "../app/env/env.server";-const builderPort =- process.env.E2E_BUILDER_PORT ??- String(20_000 + ((process.pid + Date.now()) % 40_000));+const builderPort = process.env.PORT ?? "3000";export const builderUrl =process.env.E2E_BUILDER_URL ?? `https://127.0.0.1:${builderPort}`;@@ -18,11 +17,7 @@ const builderUrlObject = new URL(builderUrl);export const dashboardUrl = `${builderUrlObject.protocol}//wstd.dev:${builderUrlObject.port}`;-export const postgrestUrl =- process.env.POSTGREST_URL ?? "http://127.0.0.1:55433";--export const serviceToken =- process.env.TRPC_SERVER_API_TOKEN ?? "e2e-service-token";+export const postgrestUrl = env.POSTGREST_URL;export type Test = {name: string;diff --git a/apps/builder/e2e/plans.ts b/apps/builder/e2e/plans.tsindex 7374ae514b..a3cf63ad77 100644--- a/apps/builder/e2e/plans.ts+++ b/apps/builder/e2e/plans.ts@@ -1,17 +1,19 @@-export const e2ePaidPlanName = "E2E Paid Plan";+import { parsePlansEnv } from "@webstudio-is/plans";+import env from "../app/env/env.server";-export const e2ePlans = [- {- name: e2ePaidPlanName,- features: {- allowAdditionalPermissions: true,- allowContentMode: true,- allowStagingPublish: true,- maxWorkspaces: 5,- maxDailyPublishesPerUser: 100,- maxProjectsAllowedPerUser: 100,- maxAssetsPerProject: 100,- },- prices: {},- },-];+const plans = parsePlansEnv(env.PLANS);++const getE2ePaidPlanName = () => {+ const planName = [...plans.values()].find(+ ({ features }) =>+ features.allowAdditionalPermissions && features.allowContentMode+ )?.name;+ if (planName !== undefined) {+ return planName;+ }+ throw new Error(+ "Expected PLANS to include a plan with allowAdditionalPermissions and allowContentMode for e2e"+ );+};++export const e2ePaidPlanName = getE2ePaidPlanName();diff --git a/apps/builder/e2e/run-local.sh b/apps/builder/e2e/run-local.shindex d8d80a0ee0..c4756cb728 100644--- a/apps/builder/e2e/run-local.sh+++ b/apps/builder/e2e/run-local.sh@@ -2,19 +2,12 @@set -euo pipefailROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"-COMPOSE_FILE="$ROOT_DIR/apps/builder/docker-compose.e2e.yaml"-SCHEMA_SNAPSHOT="$ROOT_DIR/apps/builder/e2e/schema/current.sql"+COMPOSE_OVERRIDE_FILE="$ROOT_DIR/apps/builder/docker-compose.e2e.yaml"+source "$ROOT_DIR/apps/builder/dev/backend.sh"+builder_backend_init-export AUTH_SECRET="${AUTH_SECRET:-test}"-export DATABASE_URL="${DATABASE_URL:-postgresql://user:pass@localhost:55432/webstudio}"-export DIRECT_URL="${DIRECT_URL:-$DATABASE_URL}"export E2E_DB_BOOTSTRAP="${E2E_DB_BOOTSTRAP:-auto}"export E2E_GENERATE_PRISMA="${E2E_GENERATE_PRISMA:-auto}"-export E2E_PGPORT="${E2E_PGPORT:-55432}"-export E2E_POSTGREST_PORT="${E2E_POSTGREST_PORT:-55433}"-export POSTGREST_API_KEY="${POSTGREST_API_KEY:-}"-export POSTGREST_URL="${POSTGREST_URL:-http://127.0.0.1:55433}"-export TRPC_SERVER_API_TOKEN="${TRPC_SERVER_API_TOKEN:-e2e-service-token}"export E2E_DOCKER_TIMEOUT_SECONDS="${E2E_DOCKER_TIMEOUT_SECONDS:-60}"export E2E_MIGRATIONS_TIMEOUT_SECONDS="${E2E_MIGRATIONS_TIMEOUT_SECONDS:-300}"export E2E_INSTALL_PLAYWRIGHT="${E2E_INSTALL_PLAYWRIGHT:-auto}"@@ -24,23 +17,12 @@ export E2E_BUILDER_BUILD_TIMEOUT_SECONDS="${E2E_BUILDER_BUILD_TIMEOUT_SECONDS:-6export E2E_TEST_COMMAND_TIMEOUT_SECONDS="${E2E_TEST_COMMAND_TIMEOUT_SECONDS:-900}"export E2E_WRITE_SCHEMA_SNAPSHOT="${E2E_WRITE_SCHEMA_SNAPSHOT:-false}"-RUN_STARTED_AT="$(date +%s%3N)"--now_ms() {- date +%s%3N-}-cleanup() {if [ "${E2E_SKIP_CLEANUP:-}" = "true" ]; thenreturnfi- local started_at- started_at="$(now_ms)"- docker compose -f "$COMPOSE_FILE" down --volumes --remove-orphans- local duration_ms- duration_ms="$(($(now_ms) - started_at))"- echo "[e2e:perf] phase=cleanup duration=${duration_ms}ms"+ builder_backend_down --volumes --remove-orphans}trap cleanup EXIT@@ -50,15 +32,13 @@ run_step() {local timeout_seconds="$2"shift 2- local started_at- started_at="$(now_ms)"echo "▶ $name""$@" &local pid="$!"local timeout_at- timeout_at="$(($(now_ms) + timeout_seconds * 1000))"+ timeout_at="$(($(date +%s) + timeout_seconds))"while kill -0 "$pid" 2>/dev/null; do- if [ "$(now_ms)" -ge "$timeout_at" ]; then+ if [ "$(date +%s)" -ge "$timeout_at" ]; thenecho "Timed out after ${timeout_seconds}s: $name" >&2kill "$pid" 2>/dev/null || truesleep 10@@ -73,122 +53,25 @@ run_step() {if [ "$status" -ne 0 ]; thenreturn "$status"fi- local duration_ms- duration_ms="$(($(now_ms) - started_at))"echo "✓ $name"- echo "[e2e:perf] phase=\"$name\" duration=${duration_ms}ms"-}--wait_for_step() {- local name="$1"- local pid="$2"- local status=0-- wait "$pid" || status="$?"- if [ "$status" -ne 0 ]; then- echo "Step failed: $name" >&2- return "$status"- fi-}--bootstrap_with_schema_snapshot() {- if [ ! -f "$SCHEMA_SNAPSHOT" ]; then- return 1- fi-- docker compose -f "$COMPOSE_FILE" exec -T db \- psql -q -U user -d webstudio -v ON_ERROR_STOP=1 <"$SCHEMA_SNAPSHOT" \- >/dev/null-}--bootstrap_with_migrations() {- pnpm --dir "$ROOT_DIR" --filter=./packages/prisma-client migrations migrate --dev --cwd ../../apps/builder-}--write_schema_snapshot() {- mkdir -p "$(dirname "$SCHEMA_SNAPSHOT")"- docker compose -f "$COMPOSE_FILE" exec -T db \- pg_dump -U user -d webstudio --schema-only --no-owner --no-privileges \- >"$SCHEMA_SNAPSHOT"- echo "Wrote $SCHEMA_SNAPSHOT"}bootstrap_database() {- case "$E2E_DB_BOOTSTRAP" in- schema)- bootstrap_with_schema_snapshot- ;;- migrations)- bootstrap_with_migrations- ;;- auto)- if [ -f "$SCHEMA_SNAPSHOT" ]; then- bootstrap_with_schema_snapshot- echo "Bootstrapped database from $SCHEMA_SNAPSHOT"- else- echo "No schema snapshot found at $SCHEMA_SNAPSHOT; falling back to migrations"- bootstrap_with_migrations- fi- ;;- *)- echo "Unknown E2E_DB_BOOTSTRAP value: $E2E_DB_BOOTSTRAP" >&2- exit 1- ;;- esac+ builder_backend_bootstrap "$E2E_DB_BOOTSTRAP"if [ "$E2E_WRITE_SCHEMA_SNAPSHOT" = "true" ]; then- write_schema_snapshot+ builder_backend_write_schema_snapshotfi}-has_prisma_client() {- [ -f "$ROOT_DIR/packages/prisma-client/src/__generated__/index.js" ]-}--generate_prisma_client() {- case "$E2E_GENERATE_PRISMA" in- true)- pnpm --dir "$ROOT_DIR" --filter=@webstudio-is/prisma-client generate- ;;- false)- echo "Skipping Prisma client generation"- ;;- auto)- if has_prisma_client; then- echo "Skipping Prisma client generation; generated client already exists"- else- pnpm --dir "$ROOT_DIR" --filter=@webstudio-is/prisma-client generate- fi- ;;- *)- echo "Unknown E2E_GENERATE_PRISMA value: $E2E_GENERATE_PRISMA" >&2- exit 1- ;;- esac-}--has_playwright_chromium() {- (- cd "$ROOT_DIR/apps/builder"- node -e "const { chromium } = require('playwright'); const fs = require('fs'); process.exit(fs.existsSync(chromium.executablePath()) ? 0 : 1)"- )-}-install_playwright_chromium() {case "$E2E_INSTALL_PLAYWRIGHT" in- true)+ true | auto)pnpm --dir "$ROOT_DIR" --filter=@webstudio-is/builder exec playwright install --with-deps chromium;;false)echo "Skipping Playwright Chromium install";;- auto)- if has_playwright_chromium; then- echo "Skipping Playwright Chromium install; browser already exists"- else- pnpm --dir "$ROOT_DIR" --filter=@webstudio-is/builder exec playwright install --with-deps chromium- fi- ;;*)echo "Unknown E2E_INSTALL_PLAYWRIGHT value: $E2E_INSTALL_PLAYWRIGHT" >&2exit 1@@ -200,47 +83,31 @@ build_builder_app() {pnpm --dir "$ROOT_DIR" --filter=@webstudio-is/builder build}-wait_for_database() {- local timeout_at- timeout_at="$(($(now_ms) + E2E_DOCKER_TIMEOUT_SECONDS * 1000))"-- until docker compose -f "$COMPOSE_FILE" exec -T db \- psql -q -U user -d webstudio -v ON_ERROR_STOP=1 -c "SELECT 1" \- >/dev/null 2>&1; do- if [ "$(now_ms)" -ge "$timeout_at" ]; then- echo "Timed out waiting for e2e database" >&2- return 1- fi- sleep 0.1- done+run_builder_e2e_tests() {+ (+ cd "$ROOT_DIR/apps/builder"+ pnpm exec tsx --env-file .env --env-file-if-exists .env.development --conditions=webstudio ./e2e/run.ts+ )}run_step "start e2e database" "$E2E_DOCKER_TIMEOUT_SECONDS" \- docker compose -f "$COMPOSE_FILE" up -d db+ builder_backend_start_dbrun_step "generate prisma client" "$E2E_MIGRATIONS_TIMEOUT_SECONDS" \- generate_prisma_client &-generate_prisma_client_pid="$!"--if [ "$E2E_RUN_TESTS" = "true" ]; then- run_step "install playwright chromium" "$E2E_PLAYWRIGHT_INSTALL_TIMEOUT_SECONDS" \- install_playwright_chromium &- install_playwright_chromium_pid="$!"-fi+ builder_generate_prisma_client "$E2E_GENERATE_PRISMA"run_step "wait for e2e database" "$E2E_DOCKER_TIMEOUT_SECONDS" \- wait_for_database+ builder_backend_wait_for_db "$E2E_DOCKER_TIMEOUT_SECONDS"run_step "bootstrap database schema" "$E2E_MIGRATIONS_TIMEOUT_SECONDS" \bootstrap_database-wait_for_step "generate prisma client" "$generate_prisma_client_pid"-if [ "$E2E_RUN_TESTS" = "true" ]; then- wait_for_step "install playwright chromium" "$install_playwright_chromium_pid"+ run_step "install playwright chromium" "$E2E_PLAYWRIGHT_INSTALL_TIMEOUT_SECONDS" \+ install_playwright_chromiumrun_step "start e2e postgrest" "$E2E_DOCKER_TIMEOUT_SECONDS" \- docker compose -f "$COMPOSE_FILE" up -d postgrest+ builder_backend_start_postgrestif [ "${E2E_BUILDER_URL:-}" = "" ]; thenrun_step "build builder app" "$E2E_BUILDER_BUILD_TIMEOUT_SECONDS" \@@ -248,8 +115,5 @@ if [ "$E2E_RUN_TESTS" = "true" ]; thenfirun_step "run builder e2e tests" "$E2E_TEST_COMMAND_TIMEOUT_SECONDS" \- pnpm --dir "$ROOT_DIR" --filter=@webstudio-is/builder e2e:ci+ run_builder_e2e_testsfi--TOTAL_DURATION_MS="$(($(now_ms) - RUN_STARTED_AT))"-echo "[e2e:perf] phase=total duration=${TOTAL_DURATION_MS}ms"diff --git a/apps/builder/e2e/run.ts b/apps/builder/e2e/run.tsindex 0c7f732597..fa5d6fc2ce 100644--- a/apps/builder/e2e/run.ts+++ b/apps/builder/e2e/run.ts@@ -1,18 +1,15 @@import { spawn, type ChildProcess } from "node:child_process";import { setTimeout as delay } from "node:timers/promises";import {- builderUrl,dashboardUrl,getSuites,newPage,postgrestUrl,- serviceToken,startBrowser,stopBrowser,} from "./harness";import { resetDatabase } from "./db";import { logPerf, measure, printPerfSummary } from "./perf";-import { e2ePlans } from "./plans";import "./tests/content-mode-editing.e2e";import "./tests/pages-actions.e2e";import "./tests/preview-links.e2e";@@ -156,32 +153,13 @@ const runSuiteTests = async ({}};-const getBuilderEnv = () => ({- ...process.env,- AUTH_SECRET: process.env.AUTH_SECRET ?? "test",- DATABASE_URL:- process.env.DATABASE_URL ??- "postgresql://user:pass@localhost:55432/webstudio",- DEV_LOGIN: "true",- GITHUB_SHA: process.env.GITHUB_SHA ?? "local",- POSTGREST_API_KEY: process.env.POSTGREST_API_KEY ?? "",- POSTGREST_URL: postgrestUrl,- PORT: new URL(builderUrl).port,- PLANS: process.env.PLANS ?? JSON.stringify(e2ePlans),- TRPC_SERVER_API_TOKEN: serviceToken,-});-const startBuiltBuilder = async () => {const child = spawn("pnpm",["exec", "tsx", "--conditions=webstudio", "./e2e/serve-built-remix.ts"],{cwd: new URL("..", import.meta.url),- env: {- ...getBuilderEnv(),- HOST: "127.0.0.1",- NODE_ENV: "production",- },+ env: process.env,stdio: ["ignore", "pipe", "pipe"],});diff --git a/apps/builder/package.json b/apps/builder/package.jsonindex 3f30ee4aff..bbf86971d9 100644--- a/apps/builder/package.json+++ b/apps/builder/package.json@@ -13,7 +13,7 @@"start": "remix-serve build/server/index.js","dev": "remix vite:dev","dev:auth": "DEBUG=ws:* remix vite:dev",- "e2e:ci": "tsx --conditions=webstudio ./e2e/run.ts",+ "e2e:ci": "tsx --env-file .env --env-file-if-exists .env.development --conditions=webstudio ./e2e/run.ts","e2e:local": "bash ./e2e/run-local.sh","typecheck": "tsgo --noEmit --emitDeclarationOnly false","test": "vitest run"diff --git a/package.json b/package.jsonindex 7d54d3ba4d..03c8f59302 100644--- a/package.json+++ b/package.json@@ -8,6 +8,9 @@"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","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",