From 36732a4bd3ad0efcf353430be567487f499497b2 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 7 Jan 2026 11:21:58 +0100 Subject: [PATCH] :sparkles: Make the devenv runtine initialization yarn independent (#8023) --- .gitignore | 1 + docker/devenv/files/start-tmux.sh | 8 ++------ exporter/scripts/setup | 8 ++++++++ frontend/scripts/setup | 6 ++++++ frontend/scripts/test-components | 10 +++++----- frontend/scripts/test-e2e | 9 +++++---- 6 files changed, 27 insertions(+), 15 deletions(-) create mode 100755 exporter/scripts/setup create mode 100755 frontend/scripts/setup diff --git a/.gitignore b/.gitignore index e7dfcc7462..701cbe1e15 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ !.yarn/releases !.yarn/sdks !.yarn/versions +.pnpm-store *-init.clj *.css.json *.jar diff --git a/docker/devenv/files/start-tmux.sh b/docker/devenv/files/start-tmux.sh index 6f1716bed9..6418e0a86b 100755 --- a/docker/devenv/files/start-tmux.sh +++ b/docker/devenv/files/start-tmux.sh @@ -8,14 +8,10 @@ source ~/.bashrc echo "[start-tmux.sh] Installing node dependencies" pushd ~/penpot/frontend/ -corepack install; -yarn install; -yarn playwright install chromium +./scripts/setup; popd pushd ~/penpot/exporter/ -corepack install; -yarn install -yarn playwright install chromium +./scripts/setup; popd tmux -2 new-session -d -s penpot diff --git a/exporter/scripts/setup b/exporter/scripts/setup new file mode 100755 index 0000000000..691c8c8d48 --- /dev/null +++ b/exporter/scripts/setup @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +set -e; + +corepack enable; +corepack install; +yarn install; +yarn playwright install chromium diff --git a/frontend/scripts/setup b/frontend/scripts/setup new file mode 100755 index 0000000000..7c7014e54d --- /dev/null +++ b/frontend/scripts/setup @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +corepack enable; +corepack install; +yarn install; +yarn playwright install chromium; diff --git a/frontend/scripts/test-components b/frontend/scripts/test-components index 5e7676c1e7..747a417780 100755 --- a/frontend/scripts/test-components +++ b/frontend/scripts/test-components @@ -1,10 +1,10 @@ #!/usr/bin/env bash -set -ex -corepack enable; -corepack install; -yarn install; +SCRIPT_DIR=$(dirname $0); + +set -ex + +$SCRIPT_DIR/setup; -yarn run playwright install chromium --with-deps; yarn run build:storybook yarn run test:storybook diff --git a/frontend/scripts/test-e2e b/frontend/scripts/test-e2e index 8accfcced5..1903b4ff18 100755 --- a/frontend/scripts/test-e2e +++ b/frontend/scripts/test-e2e @@ -1,8 +1,9 @@ #!/usr/bin/env bash +SCRIPT_DIR=$(dirname $0); + set -ex -corepack enable; -corepack install; -yarn install; -yarn run playwright install chromium --with-deps; + +$SCRIPT_DIR/setup; + yarn run test:e2e -x --workers=2 --reporter=list "$@";