Merge remote-tracking branch 'penpot/develop' into token-studio-develop

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

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;

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

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

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