From c6c9e7d1794ae7e2afaf07492bf7fba8525a2f8b Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Tue, 6 Aug 2024 12:29:18 +0200
Subject: [PATCH 1/5] :arrow_up: Update beicon version to v2.2

Fixes the esm build compatibility issues
---
 frontend/deps.edn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/deps.edn b/frontend/deps.edn
index 938c794a9..ec67bf562 100644
--- a/frontend/deps.edn
+++ b/frontend/deps.edn
@@ -15,8 +15,8 @@
    :exclusions [funcool/beicon2]}
 
   funcool/beicon2
-  {:git/tag "v2.1"
-   :git/sha "7d648e1"
+  {:git/tag "v2.2"
+   :git/sha "8744c66"
    :git/url "https://github.com/funcool/beicon.git"}
 
   funcool/rumext

From f5a8c806d972248ed3a37c147a934982eaa9f018 Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Tue, 6 Aug 2024 16:34:09 +0200
Subject: [PATCH 2/5] :bug: Fix missing storybook env variable for building

---
 manage.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manage.sh b/manage.sh
index a3f28c7c0..e50fe5a8c 100755
--- a/manage.sh
+++ b/manage.sh
@@ -112,6 +112,7 @@ function build {
            --mount source=${DEVENV_PNAME}_user_data,type=volume,target=/home/penpot/ \
            --mount source=`pwd`,type=bind,target=/home/penpot/penpot \
            -e EXTERNAL_UID=$CURRENT_USER_ID \
+           -e BUILD_STORYBOOK=$BUILD_STORYBOOK \
            -e SHADOWCLJS_EXTRA_PARAMS=$SHADOWCLJS_EXTRA_PARAMS \
            -w /home/penpot/penpot/$1 \
            $DEVENV_IMGNAME:latest sudo -EH -u penpot ./scripts/build $version

From 5f0c036ad50f96b23091840194d8ec9ec711e95e Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Wed, 7 Aug 2024 06:46:06 +0200
Subject: [PATCH 3/5] :bug: Fix storybook css path

---
 frontend/resources/templates/preview-head.mustache | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/resources/templates/preview-head.mustache b/frontend/resources/templates/preview-head.mustache
index fdbcabf55..d3cc7b7cd 100644
--- a/frontend/resources/templates/preview-head.mustache
+++ b/frontend/resources/templates/preview-head.mustache
@@ -1,4 +1,4 @@
-<link href="/css/ds.css?ts={{& ts}}" rel="stylesheet" type="text/css" />
+<link href="./css/ds.css?ts={{& ts}}" rel="stylesheet" type="text/css" />
 <style>
   body {
     overflow-y: scroll;

From bde1cd3f5fef90c21d6042e7065ae200ba25094e Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Wed, 7 Aug 2024 15:36:37 +0200
Subject: [PATCH 4/5] :bug: Fix unexpected exception on frontend test

caused by unexpected return nil on a merge-map
---
 frontend/src/app/main/data/changes.cljs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/src/app/main/data/changes.cljs b/frontend/src/app/main/data/changes.cljs
index 5f8229eb1..a6fd8f73d 100644
--- a/frontend/src/app/main/data/changes.cljs
+++ b/frontend/src/app/main/data/changes.cljs
@@ -56,6 +56,10 @@
                              (uw/ask! {:cmd :update-page-index
                                        :page-id page-id
                                        :changes changes})))
+             (rx/catch (fn [cause]
+                         (log/warn :hint "unable to update index"
+                                   :cause cause)
+                         (rx/empty)))
              (rx/ignore))))))
 
 (defn- get-pending-commits

From 22f3dba842b44522bbb0225f01dd86682bbb9bd8 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Wed, 7 Aug 2024 15:47:48 +0200
Subject: [PATCH 5/5] :lipstick: Update run-store helper

---
 .../test/frontend_tests/helpers/state.cljs     | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/frontend/test/frontend_tests/helpers/state.cljs b/frontend/test/frontend_tests/helpers/state.cljs
index 37d245df5..2f73c4d8d 100644
--- a/frontend/test/frontend_tests/helpers/state.cljs
+++ b/frontend/test/frontend_tests/helpers/state.cljs
@@ -42,21 +42,25 @@
   ([store done events completed-cb]
    (run-store store done events completed-cb nil))
   ([store done events completed-cb stopper]
-   (let [stream (ptk/input-stream store)]
+   (let [stream    (ptk/input-stream store)
+         stopper-s (if (fn? stopper)
+                     (stopper stream)
+                     (rx/filter #(= :the/end %) stream))]
+
      (->> stream
-          (rx/take-until (if stopper
-                           (stopper stream)
-                           (rx/filter #(= :the/end %) stream)))
+          (rx/take-until stopper-s)
           (rx/last)
-          (rx/tap (fn []
+          (rx/tap (fn [_]
                     (completed-cb @store)))
           (rx/subs! (fn [_] (done))
                     (fn [cause]
                       (js/console.log "[error]:" cause))
                     (fn [_]
                       (js/console.log "[complete]"))))
-     (doall (for [event events]
-              (ptk/emit! store event)))
+
+     (doseq [event events]
+       (ptk/emit! store event))
+
      (ptk/emit! store :the/end))))
 
 (defn get-file-from-store