diff --git a/.nvmrc b/.nvmrc index c6a66a6e6a..aa8f8f13f7 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v22.21.1 +v22.22.0 \ No newline at end of file diff --git a/CHANGES.md b/CHANGES.md index cbc691a342..af52bb58de 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -34,11 +34,7 @@ - Fix viewer can update library [Taiga #13186](https://tree.taiga.io/project/penpot/issue/13186) - Fix remove fill affects different element than selected [Taiga #13128](https://tree.taiga.io/project/penpot/issue/13128) -## 2.13.0 (Unreleased) - -### :boom: Breaking changes & Deprecations - -### :rocket: Epics and highlights +## 2.13.0 ### :heart: Community contributions (Thank you!) diff --git a/backend/deps.edn b/backend/deps.edn index cbf1176953..af73aecbc8 100644 --- a/backend/deps.edn +++ b/backend/deps.edn @@ -3,7 +3,7 @@ :deps {penpot/common {:local/root "../common"} - org.clojure/clojure {:mvn/version "1.12.2"} + org.clojure/clojure {:mvn/version "1.12.4"} org.clojure/tools.namespace {:mvn/version "1.5.0"} com.github.luben/zstd-jni {:mvn/version "1.5.7-4"} @@ -28,8 +28,8 @@ com.google.guava/guava {:mvn/version "33.4.8-jre"} funcool/yetti - {:git/tag "v11.8" - :git/sha "1d1b33f" + {:git/tag "v11.9" + :git/sha "5fad7a9" :git/url "https://github.com/funcool/yetti.git" :exclusions [org.slf4j/slf4j-api]} @@ -39,7 +39,7 @@ metosin/reitit-core {:mvn/version "0.9.1"} nrepl/nrepl {:mvn/version "1.4.0"} - org.postgresql/postgresql {:mvn/version "42.7.7"} + org.postgresql/postgresql {:mvn/version "42.7.9"} org.xerial/sqlite-jdbc {:mvn/version "3.50.3.0"} com.zaxxer/HikariCP {:mvn/version "7.0.2"} @@ -49,7 +49,7 @@ buddy/buddy-hashers {:mvn/version "2.0.167"} buddy/buddy-sign {:mvn/version "3.6.1-359"} - com.github.ben-manes.caffeine/caffeine {:mvn/version "3.2.2"} + com.github.ben-manes.caffeine/caffeine {:mvn/version "3.2.3"} org.jsoup/jsoup {:mvn/version "1.21.2"} org.im4java/im4java @@ -66,7 +66,7 @@ ;; Pretty Print specs pretty-spec/pretty-spec {:mvn/version "0.1.4"} - software.amazon.awssdk/s3 {:mvn/version "2.33.10"}} + software.amazon.awssdk/s3 {:mvn/version "2.41.21"}} :paths ["src" "resources" "target/classes"] :aliases diff --git a/common/deps.edn b/common/deps.edn index 6e7d6e948a..01b6d33df4 100644 --- a/common/deps.edn +++ b/common/deps.edn @@ -1,5 +1,5 @@ {:deps - {org.clojure/clojure {:mvn/version "1.12.2"} + {org.clojure/clojure {:mvn/version "1.12.4"} org.clojure/data.json {:mvn/version "2.5.1"} org.clojure/tools.cli {:mvn/version "1.1.230"} org.clojure/test.check {:mvn/version "1.1.1"} @@ -9,15 +9,15 @@ org.apache.commons/commons-pool2 {:mvn/version "2.12.1"} ;; Logging - org.apache.logging.log4j/log4j-api {:mvn/version "2.25.1"} - org.apache.logging.log4j/log4j-core {:mvn/version "2.25.1"} - org.apache.logging.log4j/log4j-web {:mvn/version "2.25.1"} - org.apache.logging.log4j/log4j-jul {:mvn/version "2.25.1"} - org.apache.logging.log4j/log4j-slf4j2-impl {:mvn/version "2.25.1"} + org.apache.logging.log4j/log4j-api {:mvn/version "2.25.3"} + org.apache.logging.log4j/log4j-core {:mvn/version "2.25.3"} + org.apache.logging.log4j/log4j-web {:mvn/version "2.25.3"} + org.apache.logging.log4j/log4j-jul {:mvn/version "2.25.3"} + org.apache.logging.log4j/log4j-slf4j2-impl {:mvn/version "2.25.3"} org.slf4j/slf4j-api {:mvn/version "2.0.17"} - pl.tkowalcz.tjahzi/log4j2-appender {:mvn/version "0.9.40"} + pl.tkowalcz.tjahzi/log4j2-appender {:mvn/version "0.9.41"} - selmer/selmer {:mvn/version "1.12.69"} + selmer/selmer {:mvn/version "1.12.70"} criterium/criterium {:mvn/version "0.4.6"} metosin/jsonista {:mvn/version "0.3.13"} @@ -27,7 +27,7 @@ com.cognitect/transit-clj {:mvn/version "1.0.333"} com.cognitect/transit-cljs {:mvn/version "0.8.280"} java-http-clj/java-http-clj {:mvn/version "0.4.3"} - integrant/integrant {:mvn/version "1.0.0"} + integrant/integrant {:mvn/version "1.0.1"} funcool/cuerdas {:mvn/version "2026.415"} funcool/promesa diff --git a/docker/devenv/Dockerfile b/docker/devenv/Dockerfile index fa01edf221..efa134d999 100644 --- a/docker/devenv/Dockerfile +++ b/docker/devenv/Dockerfile @@ -31,7 +31,7 @@ RUN set -ex; \ FROM base AS setup-node -ENV NODE_VERSION=v22.21.1 \ +ENV NODE_VERSION=v22.22.0 \ PATH=/opt/node/bin:$PATH RUN set -eux; \ @@ -97,18 +97,19 @@ RUN set -eux; \ FROM base AS setup-jvm -ENV CLOJURE_VERSION=1.12.3.1577 +# https://clojure.org/releases/tools +ENV CLOJURE_VERSION=1.12.4.1602 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='8c5321f16d9f1d8149f83e4e9ff8ca5d9e94320b92d205e6db42a604de3d1140'; \ - BINARY_URL='https://cdn.azul.com/zulu/bin/zulu25.30.17-ca-jdk25.0.1-linux_aarch64.tar.gz'; \ + ESUM='9903c6b19183a33725ca1dfdae5b72400c9d00995c76fafc4a0d31c5152f33f7'; \ + BINARY_URL='https://cdn.azul.com/zulu/bin/zulu25.32.21-ca-jdk25.0.2-linux_aarch64.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='471b3e62bdffaed27e37005d842d8639f10d244ccce1c7cdebf7abce06c8313e'; \ - BINARY_URL='https://cdn.azul.com/zulu/bin/zulu25.30.17-ca-jdk25.0.1-linux_x64.tar.gz'; \ + ESUM='946ad9766d98fc6ab495a1a120072197db54997f6925fb96680f1ecd5591db4e'; \ + BINARY_URL='https://cdn.azul.com/zulu/bin/zulu25.32.21-ca-jdk25.0.2-linux_x64.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ @@ -396,7 +397,7 @@ ENV LANG='C.UTF-8' \ RUSTUP_HOME="/opt/rustup" \ PATH="/opt/jdk/bin:/opt/utils/bin:/opt/clojure/bin:/opt/node/bin:/opt/imagick/bin:/opt/cargo/bin:$PATH" -COPY --from=penpotapp/imagemagick:7.1.2-0 /opt/imagick /opt/imagick +COPY --from=penpotapp/imagemagick:7.1.2-13 /opt/imagick /opt/imagick COPY --from=setup-jvm /opt/jdk /opt/jdk COPY --from=setup-jvm /opt/clojure /opt/clojure COPY --from=setup-node /opt/node /opt/node diff --git a/docker/devenv/files/bashrc b/docker/devenv/files/bashrc index 8bcf7b67b1..98fc4a96dc 100644 --- a/docker/devenv/files/bashrc +++ b/docker/devenv/files/bashrc @@ -6,7 +6,8 @@ export PATH="/home/penpot/.cargo/bin:/opt/jdk/bin:/opt/utils/bin:/opt/clojure/bi export CARGO_HOME="/home/penpot/.cargo" alias l='ls --color -GFlh' -alias rm='rm -r' +alias ll='ls --color -GFlh' +alias rm='rm -rf' alias ls='ls --color -F' alias lsd='ls -d *(/)' alias lsf='ls -h *(.)' diff --git a/docker/devenv/files/tmux.conf b/docker/devenv/files/tmux.conf index 9498c79318..2044d56556 100644 --- a/docker/devenv/files/tmux.conf +++ b/docker/devenv/files/tmux.conf @@ -1,3 +1,4 @@ +set -g default-command "${SHELL}" set -g mouse off set -g history-limit 50000 setw -g mode-keys emacs diff --git a/docker/imagemagick/Dockerfile b/docker/imagemagick/Dockerfile index 5800979878..c13221d244 100644 --- a/docker/imagemagick/Dockerfile +++ b/docker/imagemagick/Dockerfile @@ -6,7 +6,7 @@ ENV LANG='C.UTF-8' \ DEBIAN_FRONTEND=noninteractive \ TZ=Etc/UTC -ARG IMAGEMAGICK_VERSION=7.1.1-47 +ARG IMAGEMAGICK_VERSION=7.1.2-13 RUN set -e; \ apt-get -qq update; \ diff --git a/docker/images/Dockerfile.backend b/docker/images/Dockerfile.backend index 19193db906..a651415f4e 100644 --- a/docker/images/Dockerfile.backend +++ b/docker/images/Dockerfile.backend @@ -5,7 +5,7 @@ ENV LANG='C.UTF-8' \ LC_ALL='C.UTF-8' \ JAVA_HOME="/opt/jdk" \ DEBIAN_FRONTEND=noninteractive \ - NODE_VERSION=v22.21.1 \ + NODE_VERSION=v22.22.0 \ TZ=Etc/UTC RUN set -ex; \ @@ -46,12 +46,12 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='8c5321f16d9f1d8149f83e4e9ff8ca5d9e94320b92d205e6db42a604de3d1140'; \ - BINARY_URL='https://cdn.azul.com/zulu/bin/zulu25.30.17-ca-jdk25.0.1-linux_aarch64.tar.gz'; \ + ESUM='9903c6b19183a33725ca1dfdae5b72400c9d00995c76fafc4a0d31c5152f33f7'; \ + BINARY_URL='https://cdn.azul.com/zulu/bin/zulu25.32.21-ca-jdk25.0.2-linux_aarch64.tar.gz'; \ ;; \ amd64|x86_64) \ - ESUM='471b3e62bdffaed27e37005d842d8639f10d244ccce1c7cdebf7abce06c8313e'; \ - BINARY_URL='https://cdn.azul.com/zulu/bin/zulu25.30.17-ca-jdk25.0.1-linux_x64.tar.gz'; \ + ESUM='946ad9766d98fc6ab495a1a120072197db54997f6925fb96680f1ecd5591db4e'; \ + BINARY_URL='https://cdn.azul.com/zulu/bin/zulu25.32.21-ca-jdk25.0.2-linux_x64.tar.gz'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/docker/images/Dockerfile.exporter b/docker/images/Dockerfile.exporter index 33dd58f3a0..dbc2b3b8b6 100644 --- a/docker/images/Dockerfile.exporter +++ b/docker/images/Dockerfile.exporter @@ -3,7 +3,7 @@ LABEL maintainer="Penpot " ENV LANG=en_US.UTF-8 \ LC_ALL=en_US.UTF-8 \ - NODE_VERSION=v22.21.1 \ + NODE_VERSION=v22.22.0 \ DEBIAN_FRONTEND=noninteractive \ PATH=/opt/node/bin:/opt/imagick/bin:$PATH diff --git a/manage.sh b/manage.sh index 5b5b8a98f6..6c55d4e545 100755 --- a/manage.sh +++ b/manage.sh @@ -7,7 +7,7 @@ export DEVENV_PNAME="penpotdev"; export CURRENT_USER_ID=$(id -u); export CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD); -export IMAGEMAGICK_VERSION=7.1.2-0 +export IMAGEMAGICK_VERSION=7.1.2-13 # Safe directory to avoid ownership errors with Git git config --global --add safe.directory /home/penpot/penpot || true