From 8cda17f0a0993e88d187d8f02a72858da21da7a0 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Fri, 31 Jan 2025 12:48:33 +0100 Subject: [PATCH] :sparkles: Improve build process Remove hardcoded yarn version on devenv --- docker/devenv/Dockerfile | 9 --------- docker/devenv/files/start-tmux.sh | 4 +++- exporter/package.json | 2 +- frontend/package.json | 2 +- frontend/scripts/build | 3 +++ frontend/yarn.lock | 4 ++-- 6 files changed, 10 insertions(+), 14 deletions(-) diff --git a/docker/devenv/Dockerfile b/docker/devenv/Dockerfile index 88a352eeb..4aeb64289 100644 --- a/docker/devenv/Dockerfile +++ b/docker/devenv/Dockerfile @@ -162,7 +162,6 @@ RUN set -eux; \ tar -xf /tmp/nodejs.tar.gz --strip-components=1; \ chown -R root /usr/local/nodejs; \ corepack enable; \ - corepack install -g yarn@4.3.1; \ npx playwright install --with-deps chromium; \ rm -rf /tmp/nodejs.tar.gz; @@ -277,14 +276,6 @@ RUN set -eux; \ ./emsdk activate latest; \ rustup target add wasm32-unknown-emscripten; -USER penpot - -RUN set -eux; \ - corepack enable; \ - corepack install -g yarn@4.3.1; - -USER root - WORKDIR /home COPY files/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/devenv/files/start-tmux.sh b/docker/devenv/files/start-tmux.sh index de253a20d..b80e425cc 100755 --- a/docker/devenv/files/start-tmux.sh +++ b/docker/devenv/files/start-tmux.sh @@ -8,10 +8,12 @@ source ~/.bashrc echo "[start-tmux.sh] Installing node dependencies" pushd ~/penpot/frontend/ -yarn install +corepack up; +yarn install; yarn run playwright install --with-deps chromium popd pushd ~/penpot/exporter/ +corepack up; yarn install yarn run playwright install --with-deps chromium popd diff --git a/exporter/package.json b/exporter/package.json index 5adfd3ac4..80e2450ee 100644 --- a/exporter/package.json +++ b/exporter/package.json @@ -4,7 +4,7 @@ "license": "MPL-2.0", "author": "Kaleidos INC", "private": true, - "packageManager": "yarn@4.3.1", + "packageManager": "yarn@4.6.0+sha512.5383cc12567a95f1d668fbe762dfe0075c595b4bfff433be478dbbe24e05251a8e8c3eb992a986667c1d53b6c3a9c85b8398c35a960587fbd9fa3a0915406728", "repository": { "type": "git", "url": "https://github.com/penpot/penpot" diff --git a/frontend/package.json b/frontend/package.json index 5fa8ddde5..ef00f14f8 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -4,7 +4,7 @@ "license": "MPL-2.0", "author": "Kaleidos INC", "private": true, - "packageManager": "yarn@4.3.1", + "packageManager": "yarn@4.6.0+sha512.5383cc12567a95f1d668fbe762dfe0075c595b4bfff433be478dbbe24e05251a8e8c3eb992a986667c1d53b6c3a9c85b8398c35a960587fbd9fa3a0915406728", "browserslist": [ "defaults" ], diff --git a/frontend/scripts/build b/frontend/scripts/build index 3ef7ce097..b29801545 100755 --- a/frontend/scripts/build +++ b/frontend/scripts/build @@ -16,7 +16,10 @@ export TS=$(date +%s); # performant code on macros (example: rumext) export NODE_ENV=production; +corepack enable; +corepack up || exit 1; yarn install || exit 1; + rm -rf resources/public; rm -rf target/dist; diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 039f09e9e..0168c8bc8 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -11987,11 +11987,11 @@ __metadata: "typescript@patch:typescript@npm%3A^5.7.3#optional!builtin": version: 5.7.3 - resolution: "typescript@patch:typescript@npm%3A5.7.3#optional!builtin::version=5.7.3&hash=379a07" + resolution: "typescript@patch:typescript@npm%3A5.7.3#optional!builtin::version=5.7.3&hash=5786d5" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/3b56d6afa03d9f6172d0b9cdb10e6b1efc9abc1608efd7a3d2f38773d5d8cfb9bbc68dfb72f0a7de5e8db04fc847f4e4baeddcd5ad9c9feda072234f0d788896 + checksum: 10c0/6fd7e0ed3bf23a81246878c613423730c40e8bdbfec4c6e4d7bf1b847cbb39076e56ad5f50aa9d7ebd89877999abaee216002d3f2818885e41c907caaa192cc4 languageName: node linkType: hard