Merge pull request #6536 from penpot/niwinz-update-promesa

⬆️ Update dependencies

backend/deps.edn

@@ -59,7 +59,7 @@
 
   ;; Pretty Print specs
   pretty-spec/pretty-spec {:mvn/version "0.1.4"}
-  software.amazon.awssdk/s3 {:mvn/version "2.31.40"}}
+  software.amazon.awssdk/s3 {:mvn/version "2.31.48"}}
 
  :paths ["src" "resources" "target/classes"]
  :aliases
@@ -74,7 +74,7 @@
 
   :build
   {:extra-deps
-   {io.github.clojure/tools.build {:git/tag "v0.10.8" :git/sha "2fdfd66"}}
+   {io.github.clojure/tools.build {:git/tag "v0.10.9" :git/sha "e405aac"}}
    :ns-default build}
 
   :test

backend/src/app/binfile/v3.clj

@@ -570,7 +570,6 @@
                        object (-> object
                                   (assoc :file-id file-id)
                                   (update :created-at default-now)
-                                  (update :modified-at default-now)
                                   ;; FIXME: this is set default to true for
                                   ;; setting a value, this prop is no longer
                                   ;; relevant;

backend/src/app/rpc/climit.clj

@@ -22,8 +22,7 @@
    [datoteka.fs :as fs]
    [integrant.core :as ig]
    [promesa.exec :as px]
-   [promesa.exec.bulkhead :as pbh]
+   [promesa.exec.bulkhead :as pbh])
-   [promesa.protocols :as pt])
   (:import
    clojure.lang.ExceptionInfo
    java.util.concurrent.atomic.AtomicLong))
@@ -179,13 +178,12 @@
         (measure metrics mlabels stats nil)
         (log "enqueued" req-id stats limit-id limit-label limit-params nil))
 
-      ;; WORKAROUND: this is a temporal change until the bug is fixed in funcool/promesa
+      (px/invoke! limiter (fn []
-      @(pt/-submit! limiter (fn []
+                            (let [elapsed (tpoint)
-                              (let [elapsed (tpoint)
+                                  stats   (pbh/get-stats limiter)]
-                                    stats   (pbh/get-stats limiter)]
+                              (measure metrics mlabels stats elapsed)
-                                (measure metrics mlabels stats elapsed)
+                              (log "acquired" req-id stats limit-id limit-label limit-params elapsed)
-                                (log "acquired" req-id stats limit-id limit-label limit-params elapsed)
+                              (handler))))
-                                (handler))))
 
       (catch ExceptionInfo cause
         (let [{:keys [type code]} (ex-data cause)]

common/deps.edn

@@ -19,7 +19,7 @@
   criterium/criterium {:mvn/version "0.4.6"}
 
   metosin/jsonista {:mvn/version "0.3.13"}
-  metosin/malli {:mvn/version "0.17.0"}
+  metosin/malli {:mvn/version "0.18.0"}
 
   expound/expound {:mvn/version "0.9.0"}
   com.cognitect/transit-clj {:mvn/version "1.0.333"}
@@ -30,7 +30,7 @@
   funcool/tubax {:mvn/version "2021.05.20-0"}
   funcool/cuerdas {:mvn/version "2023.11.09-407"}
   funcool/promesa
-  {:git/sha "6c14b06d9d64fae6e43c1463ce313f2fdc0d989b"
+  {:git/sha "f52f58cfacf62f59eab717e2637f37729d0cc383"
    :git/url "https://github.com/funcool/promesa"}
 
   funcool/datoteka
@@ -68,7 +68,7 @@
 
   :build
   {:extra-deps
-   {io.github.clojure/tools.build {:git/tag "v0.10.8" :git/sha "2fdfd66"}}
+   {io.github.clojure/tools.build {:git/tag "v0.10.9" :git/sha "e405aac"}}
    :ns-default build}
 
   :test

exporter/deps.edn

@@ -14,9 +14,10 @@
 
   :dev
   {:extra-deps
-   {thheller/shadow-cljs {:mvn/version "3.0.5"}}}
+   {thheller/shadow-cljs {:mvn/version "3.1.4"}}}
 
   :shadow-cljs
-  {:main-opts ["-m" "shadow.cljs.devtools.cli"]}
+  {:main-opts ["-m" "shadow.cljs.devtools.cli"]
+   :jvm-opts ["--sun-misc-unsafe-memory-access=allow"]}
 
   }}

exporter/package.json

@@ -14,13 +14,13 @@
     "cookies": "^0.9.1",
     "generic-pool": "^3.9.0",
     "inflation": "^2.1.0",
-    "ioredis": "^5.4.2",
+    "ioredis": "^5.6.1",
-    "luxon": "^3.5.0",
+    "luxon": "^3.6.1",
-    "playwright": "^1.50.0",
+    "playwright": "^1.52.0",
     "raw-body": "^3.0.0",
     "svgo": "penpot/svgo#v3.1",
     "xml-js": "^1.6.11",
-    "xregexp": "^5.1.1"
+    "xregexp": "^5.1.2"
   },
   "devDependencies": {
     "shadow-cljs": "3.0.5",

exporter/src/app/renderer/bitmap.cljs

@@ -50,7 +50,7 @@
               (bw/eval! page (js* "() => document.body.style.background = 'transparent'"))
 
               ;; take the screnshot of requested objects, one by one
-              (p/run! (partial render-object page) objects)
+              (p/run (partial render-object page) objects)
               nil))]
     (p/let [params {:file-id file-id
                     :page-id page-id

exporter/src/app/renderer/svg.cljs

@@ -340,7 +340,7 @@
               (bw/sleep page 1000) ; the good old fix with sleep
 
               ;; take the screnshot of requested objects, one by one
-              (p/run! (partial render-object page) objects)
+              (p/run (partial render-object page) objects)
               nil))]
     (p/let [params {:file-id file-id
                     :page-id page-id

exporter/yarn.lock

@@ -5,13 +5,12 @@ __metadata:
   version: 8
   cacheKey: 10c0
 
-"@babel/runtime-corejs3@npm:^7.16.5":
+"@babel/runtime-corejs3@npm:^7.26.9":
-  version: 7.24.5
+  version: 7.27.1
-  resolution: "@babel/runtime-corejs3@npm:7.24.5"
+  resolution: "@babel/runtime-corejs3@npm:7.27.1"
   dependencies:
     core-js-pure: "npm:^3.30.2"
-    regenerator-runtime: "npm:^0.14.0"
+  checksum: 10c0/81b46b6c73b590842abca14024a6b7c8751eaf0b519794f129b7c971043e13967e4d370933dbd7d0fdc78872ae45971b36013e0fa13c6d5c0130bfe971be0ac1
-  checksum: 10c0/61a16b8031d312752676527746d6a70c759d578cadfdee8c7bea976e848793aa08361ba14602a9ebb3ed60af225bbdff316500b4961df91cb246f2055764f208
   languageName: node
   linkType: hard
 
@@ -566,15 +565,15 @@ __metadata:
     cookies: "npm:^0.9.1"
     generic-pool: "npm:^3.9.0"
     inflation: "npm:^2.1.0"
-    ioredis: "npm:^5.4.2"
+    ioredis: "npm:^5.6.1"
-    luxon: "npm:^3.5.0"
+    luxon: "npm:^3.6.1"
-    playwright: "npm:^1.50.0"
+    playwright: "npm:^1.52.0"
     raw-body: "npm:^3.0.0"
     shadow-cljs: "npm:3.0.5"
     source-map-support: "npm:^0.5.21"
     svgo: "penpot/svgo#v3.1"
     xml-js: "npm:^1.6.11"
-    xregexp: "npm:^5.1.1"
+    xregexp: "npm:^5.1.2"
   languageName: unknown
   linkType: soft
 
@@ -760,9 +759,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ioredis@npm:^5.4.2":
+"ioredis@npm:^5.6.1":
-  version: 5.4.2
+  version: 5.6.1
-  resolution: "ioredis@npm:5.4.2"
+  resolution: "ioredis@npm:5.6.1"
   dependencies:
     "@ioredis/commands": "npm:^1.1.1"
     cluster-key-slot: "npm:^1.1.0"
@@ -773,7 +772,7 @@ __metadata:
     redis-errors: "npm:^1.2.0"
     redis-parser: "npm:^3.0.0"
     standard-as-callback: "npm:^2.1.0"
-  checksum: 10c0/e59d2cceb43ed74b487d7b50fa91b93246e734e5d4835c7e62f64e44da072f12ab43b044248012e6f8b76c61a7c091a2388caad50e8ad69a8ce5515a730b23b8
+  checksum: 10c0/26ae49cf448e807e454a9bdea5a9dfdcf669e2fdbf2df341900a0fb693c5662fea7e39db3227ce8972d1bda0ba7da9b7410e5163b12d8878a579548d847220ac
   languageName: node
   linkType: hard
 
@@ -895,10 +894,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"luxon@npm:^3.5.0":
+"luxon@npm:^3.6.1":
-  version: 3.5.0
+  version: 3.6.1
-  resolution: "luxon@npm:3.5.0"
+  resolution: "luxon@npm:3.6.1"
-  checksum: 10c0/335789bba95077db831ef99894edadeb23023b3eb2137a1b56acd0d290082b691cf793143d69e30bc069ec95f0b49f36419f48e951c68014f19ffe12045e3494
+  checksum: 10c0/906d57a9dc4d1de9383f2e9223e378c298607c1b4d17b6657b836a3cd120feb1c1de3b5d06d846a3417e1ca764de8476e8c23b3cd4083b5cdb870adcb06a99d5
   languageName: node
   linkType: hard
 
@@ -1141,27 +1140,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"playwright-core@npm:1.50.0":
+"playwright-core@npm:1.52.0":
-  version: 1.50.0
+  version: 1.52.0
-  resolution: "playwright-core@npm:1.50.0"
+  resolution: "playwright-core@npm:1.52.0"
   bin:
     playwright-core: cli.js
-  checksum: 10c0/b0cc7fadcb2db68a7b8d730b26c7a7d17baad454a0697c781e08074a619e57779a90be9b57c4c741ff4895390bdfd093d8393a746e8bf68ae57ac452f4c1cdb2
+  checksum: 10c0/640945507e6ca2144e9f596b2a6ecac042c2fd3683ff99e6271e9a7b38f3602d415f282609d569456f66680aab8b3c5bb1b257d8fb63a7fc0ed648261110421f
   languageName: node
   linkType: hard
 
-"playwright@npm:^1.50.0":
+"playwright@npm:^1.52.0":
-  version: 1.50.0
+  version: 1.52.0
-  resolution: "playwright@npm:1.50.0"
+  resolution: "playwright@npm:1.52.0"
   dependencies:
     fsevents: "npm:2.3.2"
-    playwright-core: "npm:1.50.0"
+    playwright-core: "npm:1.52.0"
   dependenciesMeta:
     fsevents:
       optional: true
   bin:
     playwright: cli.js
-  checksum: 10c0/0076a536433819b7122066a07c5fcfa56d40d09cbbec0a39061bbfa832c8a1f626df5e4fe206fbeba56b3a61f0e2b26d4ad3c2b402852d6f147a266fd18e4ddf
+  checksum: 10c0/2c6edf1e15e59bbaf77f3fa0fe0ac975793c17cff835d9c8b8bc6395a3b6f1c01898b3058ab37891b2e4d424bcc8f1b4844fe70d943e0143d239d7451408c579
   languageName: node
   linkType: hard
 
@@ -1282,13 +1281,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"regenerator-runtime@npm:^0.14.0":
-  version: 0.14.1
-  resolution: "regenerator-runtime@npm:0.14.1"
-  checksum: 10c0/1b16eb2c4bceb1665c89de70dcb64126a22bc8eb958feef3cd68fe11ac6d2a4899b5cd1b80b0774c7c03591dc57d16631a7f69d2daa2ec98100e2f29f7ec4cc4
-  languageName: node
-  linkType: hard
-
 "retry@npm:^0.12.0":
   version: 0.12.0
   resolution: "retry@npm:0.12.0"
@@ -1704,12 +1696,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"xregexp@npm:^5.1.1":
+"xregexp@npm:^5.1.2":
-  version: 5.1.1
+  version: 5.1.2
-  resolution: "xregexp@npm:5.1.1"
+  resolution: "xregexp@npm:5.1.2"
   dependencies:
-    "@babel/runtime-corejs3": "npm:^7.16.5"
+    "@babel/runtime-corejs3": "npm:^7.26.9"
-  checksum: 10c0/ae007c7898afd808e7664931228dc4bd38e65ebc24c66318416a038b4351cc73cc9b3b9cea1ab5ffd97933bf9b75afbf848f36e91d22b2416d6bd7d6fcfd2ee6
+  checksum: 10c0/0b1d4fd6d3811066adf07f9ad27d9cf3f21c1542e8c4142355e67fdc2ba52ce23a6752020430ea24299007582b968cacc674be3bb76a937f0ef28ba9f7b41377
   languageName: node
   linkType: hard
 

frontend/deps.edn

@@ -20,8 +20,8 @@
    :git/url "https://github.com/funcool/beicon.git"}
 
   funcool/rumext
-  {:git/tag "v2.20"
+  {:git/tag "v2.21"
-   :git/sha "7f5e1cd"
+   :git/sha "072d671"
    :git/url "https://github.com/funcool/rumext.git"}
 
   instaparse/instaparse {:mvn/version "1.5.0"}
@@ -42,7 +42,7 @@
   :dev
   {:extra-paths ["dev"]
    :extra-deps
-   {thheller/shadow-cljs {:mvn/version "3.0.3"}
+   {thheller/shadow-cljs {:mvn/version "3.0.5"}
     com.bhauman/rebel-readline {:mvn/version "RELEASE"}
     org.clojure/tools.namespace {:mvn/version "RELEASE"}
     criterium/criterium {:mvn/version "RELEASE"}

frontend/package.json

@@ -50,20 +50,20 @@
     "watch:storybook:assets": "node ./scripts/watch-storybook.js"
   },
   "devDependencies": {
-    "@playwright/test": "1.48.1",
+    "@playwright/test": "1.52.0",
-    "@storybook/addon-essentials": "^8.5.2",
+    "@storybook/addon-essentials": "^8.6.14",
-    "@storybook/addon-interactions": "^8.5.2",
+    "@storybook/addon-interactions": "^8.6.14",
-    "@storybook/addon-themes": "^8.5.2",
+    "@storybook/addon-themes": "^8.6.14",
-    "@storybook/blocks": "^8.5.2",
+    "@storybook/blocks": "^8.6.14",
-    "@storybook/react": "^8.5.2",
+    "@storybook/react": "^8.6.14",
-    "@storybook/react-vite": "^8.5.2",
+    "@storybook/react-vite": "^8.6.14",
-    "@storybook/test": "^8.5.2",
+    "@storybook/test": "^8.6.14",
-    "@storybook/test-runner": "^0.21.0",
+    "@storybook/test-runner": "^0.22.0",
-    "@types/node": "^22.12.0",
+    "@types/node": "^22.15.21",
-    "autoprefixer": "^10.4.20",
+    "autoprefixer": "^10.4.21",
     "concurrently": "^9.1.2",
-    "esbuild": "^0.24.2",
+    "esbuild": "^0.25.4",
-    "express": "^4.21.1",
+    "express": "^5.1.0",
     "fancy-log": "^2.0.0",
     "getopts": "^2.3.0",
     "gettext-parser": "^8.0.0",
@@ -76,7 +76,7 @@
     "gulp-svg-sprite": "^2.0.3",
     "jsdom": "^26.1.0",
     "map-stream": "0.0.7",
-    "marked": "^14.1.4",
+    "marked": "^15.0.12",
     "mkdirp": "^3.0.1",
     "mustache": "^4.2.0",
     "nodemon": "^3.1.10",
@@ -88,14 +88,14 @@
     "pretty-time": "^1.1.0",
     "prop-types": "^15.8.1",
     "rimraf": "^6.0.1",
-    "sass": "^1.83.4",
+    "sass": "^1.89.0",
-    "sass-embedded": "^1.83.4",
+    "sass-embedded": "^1.89.0",
     "shadow-cljs": "3.0.5",
-    "storybook": "^8.5.2",
+    "storybook": "^8.6.14",
     "svg-sprite": "^2.0.4",
-    "typescript": "^5.7.3",
+    "typescript": "^5.8.3",
-    "vite": "^6.0.11",
+    "vite": "^6.3.5",
-    "vitest": "^3.0.4",
+    "vitest": "^3.1.4",
     "wasm-pack": "^0.13.1",
     "watcher": "^2.3.1",
     "workerpool": "^9.2.0"
@@ -108,9 +108,9 @@
     "@penpot/text-editor": "portal:./text-editor",
     "@tokens-studio/sd-transforms": "1.2.11",
     "@zip.js/zip.js": "patch:@zip.js/zip.js@npm%3A2.7.60#~/.yarn/patches/@zip.js-zip.js-npm-2.7.60-b6b814410b.patch",
-    "compression": "^1.7.5",
+    "compression": "^1.8.0",
     "date-fns": "^4.1.0",
-    "eventsource-parser": "^3.0.1",
+    "eventsource-parser": "^3.0.2",
     "js-beautify": "^1.15.4",
     "lodash": "^4.17.21",
     "lodash.debounce": "^4.0.8",
@@ -118,9 +118,9 @@
     "opentype.js": "^1.3.4",
     "postcss-modules": "^6.0.1",
     "randomcolor": "^0.6.2",
-    "react": "18.3.1",
+    "react": "19.1.0",
-    "react-dom": "18.3.1",
+    "react-dom": "19.1.0",
-    "react-error-boundary": "^5.0.0",
+    "react-error-boundary": "^6.0.0",
     "react-virtualized": "^9.22.6",
     "rxjs": "8.0.0-alpha.14",
     "sax": "^1.4.1",

frontend/shadow-cljs.edn

@@ -122,7 +122,10 @@
   :storybook
   {:target :esm
    :output-dir "target/storybook/"
-   :js-options {:js-provider :import}
+   :js-options
+   {:js-provider :import
+    :entry-keys ["module" "browser" "main"]
+    :export-conditions ["module" "import", "browser" "require" "default"]}
 
    :modules
    {:base