✨ Make automatic workflows not dependent on yarn

All they only needed for build process.

.github/workflows/tests.yml

@@ -20,7 +20,7 @@ concurrency:
 
 jobs:
   lint:
-    name: "Code Linter"
+    name: "Linter"
     runs-on: ubuntu-24.04
     container: penpotapp/devenv:latest
 
@@ -30,10 +30,7 @@ jobs:
 
       - name: Check clojure code format
         run: |
-          corepack enable;
-          corepack install;
-          yarn install
-          yarn run fmt:clj:check
+          ./scripts/lint
 
   test-common:
     name: "Common Tests"
@@ -52,10 +49,7 @@ jobs:
       - name: Run tests on NODE
         working-directory: ./common
         run: |
-          corepack enable;
-          corepack install;
-          yarn install;
-          yarn run test;
+          ./scripts/test
 
   test-frontend:
     name: "Frontend Tests"
@@ -69,25 +63,12 @@ jobs:
       - name: Unit Tests
         working-directory: ./frontend
         run: |
-          corepack enable;
-          corepack install;
-          yarn install;
-          yarn run test;
+          ./scripts/test
 
       - name: Component Tests
         working-directory: ./frontend
         run: |
-            yarn run playwright install chromium --with-deps;
-            yarn run build:storybook
-
-            npx concurrently -k -s first -n "SB,TEST" -c "magenta,blue" \
-              "npx http-server storybook-static --port 6006 --silent" \
-              "npx wait-on tcp:6006 && yarn test:storybook"
-
-      - name: Check SCSS Format
-        working-directory: ./frontend
-        run: |
-          yarn run lint:scss;
+          ./scripts/test-components
 
   test-render-wasm:
     name: "Render WASM Tests"
@@ -164,11 +145,7 @@ jobs:
       - name: Run tests
         working-directory: ./library
         run: |
-          corepack enable;
-          corepack install;
-          yarn install;
-          yarn run build:bundle;
-          yarn run test;
+          ./scripts/test
 
   build-integration:
     name: "Build Integration Bundle"
@@ -182,17 +159,7 @@ jobs:
       - name: Build Bundle
         working-directory: ./frontend
         run: |
-          corepack enable;
-          corepack install;
-          yarn install
-          yarn run build:app:assets
-          yarn run build:app
-          yarn run build:app:libs
-
-      - name: Build WASM
-        working-directory: "./render-wasm"
-        run: |
-          ./build release
+          ./scripts/build 0.0.0
 
       - name: Store Bundle Cache
         uses: actions/cache@v4
@@ -200,6 +167,7 @@ jobs:
           key: "integration-bundle-${{ github.sha }}"
           path: frontend/resources/public
 
+
   test-integration-1:
     name: "Integration Tests 1/4"
     runs-on: ubuntu-24.04
@@ -219,11 +187,7 @@ jobs:
       - name: Run Tests
         working-directory: ./frontend
         run: |
-          corepack enable;
-          corepack install;
-          yarn install;
-          yarn run playwright install chromium --with-deps;
-          yarn run test:e2e -x --workers=2 --reporter=list --shard="1/4";
+          ./scripts/test-e2e --shard="1/4";
 
       - name: Upload test result
         uses: actions/upload-artifact@v4
@@ -253,11 +217,7 @@ jobs:
       - name: Run Tests
         working-directory: ./frontend
         run: |
-          corepack enable;
-          corepack install;
-          yarn install;
-          yarn run playwright install chromium --with-deps;
-          yarn run test:e2e -x --workers=2 --reporter=list --shard "2/4";
+          ./scripts/test-e2e --shard="2/4";
 
       - name: Upload test result
         uses: actions/upload-artifact@v4
@@ -287,11 +247,7 @@ jobs:
       - name: Run Tests
         working-directory: ./frontend
         run: |
-          corepack enable;
-          corepack install;
-          yarn install;
-          yarn run playwright install chromium --with-deps;
-          yarn run test:e2e -x --workers=2 --reporter=list --shard "3/4";
+          ./scripts/test-e2e --shard="3/4";
 
       - name: Upload test result
         uses: actions/upload-artifact@v4
@@ -303,7 +259,7 @@ jobs:
           retention-days: 3
 
   test-integration-4:
-    name: "Integration Tests 3/4"
+    name: "Integration Tests 4/4"
     runs-on: ubuntu-24.04
     container: penpotapp/devenv:latest
     needs: build-integration
@@ -321,11 +277,7 @@ jobs:
       - name: Run Tests
         working-directory: ./frontend
         run: |
-          corepack enable;
-          corepack install;
-          yarn install;
-          yarn run playwright install chromium --with-deps;
-          yarn run test:e2e -x --workers=2 --reporter=list --shard "4/4";
+          ./scripts/test-e2e --shard="4/4";
 
       - name: Upload test result
         uses: actions/upload-artifact@v4

.gitignore

@@ -80,3 +80,4 @@ node_modules
 /playwright/.cache/
 /render-wasm/target/
 /**/.yarn/*
+/.pnpm-store

common/deps.edn

@@ -29,7 +29,6 @@
   java-http-clj/java-http-clj {:mvn/version "0.4.3"}
   integrant/integrant {:mvn/version "1.0.0"}
 
-  funcool/tubax {:mvn/version "2021.05.20-0"}
   funcool/cuerdas {:mvn/version "2025.06.16-414"}
   funcool/promesa
   {:git/sha "46048fc0d4bf5466a2a4121f5d52aefa6337f2e8"

common/scripts/test

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -ex
+corepack enable;
+corepack install;
+yarn install;
+yarn run test;

common/src/app/common/exceptions.cljc

@@ -14,8 +14,7 @@
    [app.common.schema :as sm]
    [clojure.core :as c]
    [clojure.spec.alpha :as s]
-   [cuerdas.core :as str]
-   [expound.alpha :as expound])
+   [cuerdas.core :as str])
   #?(:clj
      (:import
       clojure.lang.IPersistentMap)))
@@ -110,13 +109,6 @@
          (contains? data :explain))
     (explain (:explain data) opts)
 
-    (and (contains? data ::s/problems)
-         (contains? data ::s/value)
-         (contains? data ::s/spec))
-    (binding [s/*explain-out* expound/printer]
-      (with-out-str
-        (s/explain-out (update data ::s/problems #(take (:length opts 10) %)))))
-
     (contains? data ::sm/explain)
     (sm/humanize-explain (::sm/explain data) opts)))
 

common/src/app/common/logging.cljc

@@ -43,8 +43,6 @@
   "
   #?(:cljs (:require-macros [app.common.logging :as l]))
   (:require
-   #?(:clj  [clojure.edn :as edn]
-      :cljs [cljs.reader :as edn])
    [app.common.data :as d]
    [app.common.exceptions :as ex]
    [app.common.pprint :as pp]

common/src/app/common/logic/libraries.cljc

@@ -18,7 +18,6 @@
    [app.common.logic.shapes :as cls]
    [app.common.logic.variant-properties :as clvp]
    [app.common.path-names :as cpn]
-   [app.common.spec :as us]
    [app.common.types.component :as ctk]
    [app.common.types.components-list :as ctkl]
    [app.common.types.container :as ctn]
@@ -35,8 +34,7 @@
    [app.common.types.typography :as cty]
    [app.common.types.variant :as ctv]
    [app.common.uuid :as uuid]
-   [clojure.set :as set]
-   [clojure.spec.alpha :as s]))
+   [clojure.set :as set]))
 
 ;; Change this to :info :debug or :trace to debug this module, or :warn to reset to default
 (log/set-level! :warn)
@@ -473,10 +471,10 @@
   If an asset id is given, only shapes linked to this particular asset will
   be synchronized."
   [changes file-id asset-type asset-id library-id libraries current-file-id]
-  (s/assert #{:colors :components :typographies} asset-type)
-  (s/assert (s/nilable ::us/uuid) asset-id)
-  (s/assert ::us/uuid file-id)
-  (s/assert ::us/uuid library-id)
+  (assert (contains? #{:colors :components :typographies} asset-type))
+  (assert (or (nil? asset-id) (uuid? asset-id)))
+  (assert (uuid? file-id))
+  (assert (uuid? library-id))
 
   (container-log :info asset-id
                  :msg "Sync file with library"
@@ -510,10 +508,10 @@
   If an asset id is given, only shapes linked to this particular asset will
   be synchronized."
   [changes file-id asset-type asset-id library-id libraries current-file-id]
-  (s/assert #{:colors :components :typographies} asset-type)
-  (s/assert (s/nilable ::us/uuid) asset-id)
-  (s/assert ::us/uuid file-id)
-  (s/assert ::us/uuid library-id)
+  (assert (contains? #{:colors :components :typographies} asset-type))
+  (assert (or (nil? asset-id) (uuid? asset-id)))
+  (assert (uuid? file-id))
+  (assert (uuid? library-id))
 
   (container-log :info asset-id
                  :msg "Sync local components with library"

common/src/app/common/schema.cljc

@@ -8,6 +8,8 @@
   (:refer-clojure :exclude [deref merge parse-uuid parse-long parse-double parse-boolean type keys])
   #?(:cljs (:require-macros [app.common.schema :refer [ignoring]]))
   (:require
+   #?(:clj [malli.dev.pretty :as mdp])
+   #?(:clj [malli.dev.virhe :as v])
    [app.common.data :as d]
    [app.common.math :as mth]
    [app.common.pprint :as pp]
@@ -19,8 +21,6 @@
    [clojure.core :as c]
    [cuerdas.core :as str]
    [malli.core :as m]
-   [malli.dev.pretty :as mdp]
-   [malli.dev.virhe :as v]
    [malli.error :as me]
    [malli.generator :as mg]
    [malli.registry :as mr]
@@ -245,27 +245,30 @@
                                      :level (d/nilv level 8)
                                      :length (d/nilv length 12)})))))
 
-(defmethod v/-format ::schemaless-explain
-  [_ explanation printer]
-  {:body [:group
-          (v/-block "Value" (v/-visit (me/error-value explanation printer) printer) printer) :break :break
-          (v/-block "Errors" (v/-visit (me/humanize (me/with-spell-checking explanation)) printer) printer)]})
+#?(:clj
+   (defmethod v/-format ::schemaless-explain
+     [_ explanation printer]
+     {:body [:group
+             (v/-block "Value" (v/-visit (me/error-value explanation printer) printer) printer) :break :break
+             (v/-block "Errors" (v/-visit (me/humanize (me/with-spell-checking explanation)) printer) printer)]}))
 
-(defmethod v/-format ::explain
-  [_ {:keys [schema] :as explanation} printer]
-  {:body [:group
-          (v/-block "Value" (v/-visit (me/error-value explanation printer) printer) printer) :break :break
-          (v/-block "Errors" (v/-visit (me/humanize (me/with-spell-checking explanation)) printer) printer) :break :break
-          (v/-block "Schema" (v/-visit schema printer) printer)]})
+#?(:clj
+   (defmethod v/-format ::explain
+     [_ {:keys [schema] :as explanation} printer]
+     {:body [:group
+             (v/-block "Value" (v/-visit (me/error-value explanation printer) printer) printer) :break :break
+             (v/-block "Errors" (v/-visit (me/humanize (me/with-spell-checking explanation)) printer) printer) :break :break
+             (v/-block "Schema" (v/-visit schema printer) printer)]}))
 
-(defn pretty-explain
-  "A helper that allows print a console-friendly output for the
-  explain; should not be used for other purposes"
-  [explain & {:keys [variant message]
-              :or {variant ::explain
-                   message "Validation Error"}}]
-  (let [explain (fn [] (me/with-error-messages explain))]
-    ((mdp/prettifier variant message explain default-options))))
+#?(:clj
+   (defn pretty-explain
+     "A helper that allows print a console-friendly output for the explain;
+  should not be used for other purposes"
+     [explain & {:keys [variant message]
+                 :or {variant ::explain
+                      message "Validation Error"}}]
+     (let [explain (fn [] (me/with-error-messages explain))]
+       ((mdp/prettifier variant message explain default-options)))))
 
 (defmacro ignoring
   [expr]
@@ -299,6 +302,13 @@
                                   ::explain explain}))))
         value))))
 
+(defn coercer
+  [schema & {:as opts}]
+  (let [decode-fn (decoder schema json-transformer)
+        check-fn  (check-fn schema opts)]
+    (fn [data]
+      (-> data decode-fn check-fn))))
+
 (defn check
   "A helper intended to be used on assertions for validate/check the
   schema over provided data. Raises an assertion exception.
@@ -993,6 +1003,9 @@
 (def valid-safe-number?
   (lazy-validator ::safe-number))
 
+(def valid-safe-int?
+  (lazy-validator ::safe-int))
+
 (def valid-text?
   (validator ::text))
 

exporter/package.json

@@ -4,7 +4,7 @@
   "license": "MPL-2.0",
   "author": "Kaleidos INC",
   "private": true,
-  "packageManager": "yarn@4.10.3+sha512.c38cafb5c7bb273f3926d04e55e1d8c9dfa7d9c3ea1f36a4868fa028b9e5f72298f0b7f401ad5eb921749eb012eb1c3bb74bf7503df3ee43fd600d14a018266f",
+  "packageManager": "yarn@4.12.0+sha512.f45ab632439a67f8bc759bf32ead036a1f413287b9042726b7cc4818b7b49e14e9423ba49b18f9e06ea4941c1ad062385b1d8760a8d5091a1a31e5f6219afca8",
   "repository": {
     "type": "git",
     "url": "https://github.com/penpot/penpot"
@@ -16,9 +16,9 @@
     "date-fns": "^4.1.0",
     "generic-pool": "^3.9.0",
     "inflation": "^2.1.0",
-    "ioredis": "^5.8.1",
-    "playwright": "^1.55.1",
-    "raw-body": "^3.0.1",
+    "ioredis": "^5.8.2",
+    "playwright": "^1.57.0",
+    "raw-body": "^3.0.2",
     "source-map-support": "^0.5.21",
     "svgo": "penpot/svgo#v3.1",
     "xml-js": "^1.6.11",

exporter/yarn.lock

@@ -243,7 +243,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bytes@npm:3.1.2":
+"bytes@npm:~3.1.2":
   version: 3.1.2
   resolution: "bytes@npm:3.1.2"
   checksum: 10c0/76d1c43cbd602794ad8ad2ae94095cddeb1de78c5dddaa7005c51af10b0176c69971a6d88e805a90c2b6550d76636e43c40d8427a808b8645ede885de4a0358e
@@ -442,7 +442,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"depd@npm:2.0.0, depd@npm:~2.0.0":
+"depd@npm:~2.0.0":
   version: 2.0.0
   resolution: "depd@npm:2.0.0"
   checksum: 10c0/58bd06ec20e19529b06f7ad07ddab60e504d9e0faca4bd23079fac2d279c3594334d736508dc350e06e510aba5e22e4594483b3a6562ce7c17dd797f4cc4ad2c
@@ -577,9 +577,9 @@ __metadata:
     date-fns: "npm:^4.1.0"
     generic-pool: "npm:^3.9.0"
     inflation: "npm:^2.1.0"
-    ioredis: "npm:^5.8.1"
-    playwright: "npm:^1.55.1"
-    raw-body: "npm:^3.0.1"
+    ioredis: "npm:^5.8.2"
+    playwright: "npm:^1.57.0"
+    raw-body: "npm:^3.0.2"
     source-map-support: "npm:^0.5.21"
     svgo: "penpot/svgo#v3.1"
     ws: "npm:^8.18.3"
@@ -682,16 +682,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"http-errors@npm:2.0.0":
-  version: 2.0.0
-  resolution: "http-errors@npm:2.0.0"
+"http-errors@npm:~2.0.1":
+  version: 2.0.1
+  resolution: "http-errors@npm:2.0.1"
   dependencies:
-    depd: "npm:2.0.0"
-    inherits: "npm:2.0.4"
-    setprototypeof: "npm:1.2.0"
-    statuses: "npm:2.0.1"
-    toidentifier: "npm:1.0.1"
-  checksum: 10c0/fc6f2715fe188d091274b5ffc8b3657bd85c63e969daa68ccb77afb05b071a4b62841acb7a21e417b5539014dff2ebf9550f0b14a9ff126f2734a7c1387f8e19
+    depd: "npm:~2.0.0"
+    inherits: "npm:~2.0.4"
+    setprototypeof: "npm:~1.2.0"
+    statuses: "npm:~2.0.2"
+    toidentifier: "npm:~1.0.1"
+  checksum: 10c0/fb38906cef4f5c83952d97661fe14dc156cb59fe54812a42cd448fa57b5c5dfcb38a40a916957737bd6b87aab257c0648d63eb5b6a9ca9f548e105b6072712d4
   languageName: node
   linkType: hard
 
@@ -715,15 +715,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"iconv-lite@npm:0.7.0":
-  version: 0.7.0
-  resolution: "iconv-lite@npm:0.7.0"
-  dependencies:
-    safer-buffer: "npm:>= 2.1.2 < 3.0.0"
-  checksum: 10c0/2382400469071c55b6746c531eed5fa4d033e5db6690b7331fb2a5f59a30d7a9782932e92253db26df33c1cf46fa200a3fbe524a2a7c62037c762283f188ec2f
-  languageName: node
-  linkType: hard
-
 "iconv-lite@npm:^0.6.2":
   version: 0.6.3
   resolution: "iconv-lite@npm:0.6.3"
@@ -733,6 +724,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"iconv-lite@npm:~0.7.0":
+  version: 0.7.0
+  resolution: "iconv-lite@npm:0.7.0"
+  dependencies:
+    safer-buffer: "npm:>= 2.1.2 < 3.0.0"
+  checksum: 10c0/2382400469071c55b6746c531eed5fa4d033e5db6690b7331fb2a5f59a30d7a9782932e92253db26df33c1cf46fa200a3fbe524a2a7c62037c762283f188ec2f
+  languageName: node
+  linkType: hard
+
 "ieee754@npm:^1.2.1":
   version: 1.2.1
   resolution: "ieee754@npm:1.2.1"
@@ -754,16 +754,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"inherits@npm:2.0.4, inherits@npm:~2.0.3":
+"inherits@npm:~2.0.3, inherits@npm:~2.0.4":
   version: 2.0.4
   resolution: "inherits@npm:2.0.4"
   checksum: 10c0/4e531f648b29039fb7426fb94075e6545faa1eb9fe83c29f0b6d9e7263aceb4289d2d4557db0d428188eeb449cc7c5e77b0a0b2c4e248ff2a65933a0dee49ef2
   languageName: node
   linkType: hard
 
-"ioredis@npm:^5.8.1":
-  version: 5.8.1
-  resolution: "ioredis@npm:5.8.1"
+"ioredis@npm:^5.8.2":
+  version: 5.8.2
+  resolution: "ioredis@npm:5.8.2"
   dependencies:
     "@ioredis/commands": "npm:1.4.0"
     cluster-key-slot: "npm:^1.1.0"
@@ -774,7 +774,7 @@ __metadata:
     redis-errors: "npm:^1.2.0"
     redis-parser: "npm:^3.0.0"
     standard-as-callback: "npm:^2.1.0"
-  checksum: 10c0/4ed66444017150da027bce940a24bf726994691e2a7b3aa11d52f8aeb37f258068cc171af4d9c61247acafc28eb086fa8a7c79420b8e8d2907d2f74f39584465
+  checksum: 10c0/305e385f811d49908899e32c2de69616cd059f909afd9e0a53e54f596b1a5835ee3449bfc6a3c49afbc5a2fd27990059e316cc78f449c94024957bd34c826d88
   languageName: node
   linkType: hard
 
@@ -1105,27 +1105,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"playwright-core@npm:1.55.1":
-  version: 1.55.1
-  resolution: "playwright-core@npm:1.55.1"
+"playwright-core@npm:1.57.0":
+  version: 1.57.0
+  resolution: "playwright-core@npm:1.57.0"
   bin:
     playwright-core: cli.js
-  checksum: 10c0/39837a8c1232ec27486eac8c3fcacc0b090acc64310f7f9004b06715370fc426f944e3610fe8c29f17cd3d68280ed72c75f660c02aa5b5cf0eb34bab0031308f
+  checksum: 10c0/798e35d83bf48419a8c73de20bb94d68be5dde68de23f95d80a0ebe401e3b83e29e3e84aea7894d67fa6c79d2d3d40cc5bcde3e166f657ce50987aaa2421b6a9
   languageName: node
   linkType: hard
 
-"playwright@npm:^1.55.1":
-  version: 1.55.1
-  resolution: "playwright@npm:1.55.1"
+"playwright@npm:^1.57.0":
+  version: 1.57.0
+  resolution: "playwright@npm:1.57.0"
   dependencies:
     fsevents: "npm:2.3.2"
-    playwright-core: "npm:1.55.1"
+    playwright-core: "npm:1.57.0"
   dependenciesMeta:
     fsevents:
       optional: true
   bin:
     playwright: cli.js
-  checksum: 10c0/b84a97b0d764403df512f5bbb10c7343974e151a28202cc06f90883a13e8a45f4491a0597f0ae5fb03a026746cbc0d200f0f32195bfaa381aee5ca5770626771
+  checksum: 10c0/ab03c99a67b835bdea9059f516ad3b6e42c21025f9adaa161a4ef6bc7ca716dcba476d287140bb240d06126eb23f889a8933b8f5f1f1a56b80659d92d1358899
   languageName: node
   linkType: hard
 
@@ -1160,15 +1160,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"raw-body@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "raw-body@npm:3.0.1"
+"raw-body@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "raw-body@npm:3.0.2"
   dependencies:
-    bytes: "npm:3.1.2"
-    http-errors: "npm:2.0.0"
-    iconv-lite: "npm:0.7.0"
-    unpipe: "npm:1.0.0"
-  checksum: 10c0/892f4fbd21ecab7e2fed0f045f7af9e16df7e8050879639d4e482784a2f4640aaaa33d916a0e98013f23acb82e09c2e3c57f84ab97104449f728d22f65a7d79a
+    bytes: "npm:~3.1.2"
+    http-errors: "npm:~2.0.1"
+    iconv-lite: "npm:~0.7.0"
+    unpipe: "npm:~1.0.0"
+  checksum: 10c0/d266678d08e1e7abea62c0ce5864344e980fa81c64f6b481e9842c5beaed2cdcf975f658a3ccd67ad35fc919c1f6664ccc106067801850286a6cbe101de89f29
   languageName: node
   linkType: hard
 
@@ -1269,7 +1269,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"setprototypeof@npm:1.2.0":
+"setprototypeof@npm:~1.2.0":
   version: 1.2.0
   resolution: "setprototypeof@npm:1.2.0"
   checksum: 10c0/68733173026766fa0d9ecaeb07f0483f4c2dc70ca376b3b7c40b7cda909f94b0918f6c5ad5ce27a9160bdfb475efaa9d5e705a11d8eaae18f9835d20976028bc
@@ -1367,10 +1367,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"statuses@npm:2.0.1":
-  version: 2.0.1
-  resolution: "statuses@npm:2.0.1"
-  checksum: 10c0/34378b207a1620a24804ce8b5d230fea0c279f00b18a7209646d5d47e419d1cc23e7cbf33a25a1e51ac38973dc2ac2e1e9c647a8e481ef365f77668d72becfd0
+"statuses@npm:~2.0.2":
+  version: 2.0.2
+  resolution: "statuses@npm:2.0.2"
+  checksum: 10c0/a9947d98ad60d01f6b26727570f3bcceb6c8fa789da64fe6889908fe2e294d57503b14bf2b5af7605c2d36647259e856635cd4c49eab41667658ec9d0080ec3f
   languageName: node
   linkType: hard
 
@@ -1499,7 +1499,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"toidentifier@npm:1.0.1":
+"toidentifier@npm:~1.0.1":
   version: 1.0.1
   resolution: "toidentifier@npm:1.0.1"
   checksum: 10c0/93937279934bd66cc3270016dd8d0afec14fb7c94a05c72dc57321f8bd1fa97e5bea6d1f7c89e728d077ca31ea125b78320a616a6c6cd0e6b9cb94cb864381c1
@@ -1531,7 +1531,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unpipe@npm:1.0.0":
+"unpipe@npm:~1.0.0":
   version: 1.0.0
   resolution: "unpipe@npm:1.0.0"
   checksum: 10c0/193400255bd48968e5c5383730344fbb4fa114cdedfab26e329e50dd2d81b134244bb8a72c6ac1b10ab0281a58b363d06405632c9d49ca9dfd5e90cbd7d0f32c

frontend/.yarn/patches/@zip.js-zip.js-npm-2.7.60-b6b814410b.patch

@@ -1,18 +0,0 @@
-diff --git a/lib/zip-fs.js b/lib/zip-fs.js
-index 1444c0f00e5f1ad6c13521f90a7f3c6659d81116..90e38baef5365c2abbcb9337f7ab37f800e883a4 100644
---- a/lib/zip-fs.js
-+++ b/lib/zip-fs.js
-@@ -33,12 +33,7 @@ import { initShimAsyncCodec } from "./core/util/stream-codec-shim.js";
- import { terminateWorkers } from "./core/codec-pool.js";
- 
- let baseURL;
--try {
--	baseURL = import.meta.url;
--	// eslint-disable-next-line no-unused-vars
--} catch (_) {
--	// ignored
--}
-+
- configure({ baseURL });
- configureWebWorker(configure);
- 

frontend/.yarn/patches/@zip.js-zip.js-npm-2.8.11-b131c96df8.patch

@@ -0,0 +1,17 @@
+diff --git a/lib/zip-core-base.js b/lib/zip-core-base.js
+index 142155c8c3ab1a6caa7c370e8a2931a954556ca9..61b0fe6efb91312f437750e0002218f218afad8b 100644
+--- a/lib/zip-core-base.js
++++ b/lib/zip-core-base.js
+@@ -28,12 +28,6 @@
+ 
+ import { configure } from "./core/configuration.js";
+ 
+-try {
+-	configure({ baseURI: import.meta.url });
+-} catch {
+-	// ignored
+-}
+-
+ export * from "./zip-core-reader.js";
+ export * from "./zip-core-writer.js";
+ export {

frontend/deps.edn

@@ -8,6 +8,11 @@
   metosin/reitit-core {:mvn/version "0.9.1"}
   funcool/okulary {:mvn/version "2022.04.11-16"}
 
+  funcool/tubax
+  {:git/tag "v2025.11.28"
+   :git/sha "2d9a986"
+   :git/url "https://github.com/funcool/tubax.git"}
+
   funcool/potok2
   {:git/tag "v2.2"
    :git/sha "0f7e15a"
@@ -20,8 +25,8 @@
    :git/url "https://github.com/funcool/beicon.git"}
 
   funcool/rumext
-  {:git/tag "v2.24"
-   :git/sha "17a0c94"
+  {:git/tag "v2.25"
+   :git/sha "27e5a1a"
    :git/url "https://github.com/funcool/rumext.git"}
 
   instaparse/instaparse {:mvn/version "1.5.0"}
@@ -42,7 +47,7 @@
   :dev
   {:extra-paths ["dev"]
    :extra-deps
-   {thheller/shadow-cljs {:mvn/version "3.2.0"}
+   {thheller/shadow-cljs {:mvn/version "3.2.2"}
     com.bhauman/rebel-readline {:mvn/version "RELEASE"}
     org.clojure/tools.namespace {:mvn/version "RELEASE"}
     criterium/criterium {:mvn/version "RELEASE"}

frontend/package.json

@@ -4,7 +4,7 @@
   "license": "MPL-2.0",
   "author": "Kaleidos INC",
   "private": true,
-  "packageManager": "yarn@4.10.3+sha512.c38cafb5c7bb273f3926d04e55e1d8c9dfa7d9c3ea1f36a4868fa028b9e5f72298f0b7f401ad5eb921749eb012eb1c3bb74bf7503df3ee43fd600d14a018266f",
+  "packageManager": "yarn@4.12.0+sha512.f45ab632439a67f8bc759bf32ead036a1f413287b9042726b7cc4818b7b49e14e9423ba49b18f9e06ea4941c1ad062385b1d8760a8d5091a1a31e5f6219afca8",
   "browserslist": [
     "defaults"
   ],
@@ -14,10 +14,10 @@
     "url": "https://github.com/penpot/penpot"
   },
   "resolutions": {
-    "@zip.js/zip.js@npm:^2.7.44": "patch:@zip.js/zip.js@npm%3A2.7.60#~/.yarn/patches/@zip.js-zip.js-npm-2.7.60-b6b814410b.patch",
     "@vitejs/plugin-react": "^4.2.0",
     "playwright": "1.52.0",
-    "playwright-core": "1.52.0"
+    "playwright-core": "1.52.0",
+    "@zip.js/zip.js@npm:^2.7.44": "patch:@zip.js/zip.js@npm%3A2.8.11#~/.yarn/patches/@zip.js-zip.js-npm-2.8.11-b131c96df8.patch"
   },
   "scripts": {
     "build:app:assets": "node ./scripts/build-app-assets.js",
@@ -45,91 +45,82 @@
     "translations": "node ./scripts/translations.js",
     "watch:app:assets": "node ./scripts/watch.js",
     "watch:app:libs": "node ./scripts/build-libs.js --watch",
-    "watch:app:main": "clojure -M:dev:shadow-cljs watch main storybook",
+    "watch:app:main": "clojure -M:dev:shadow-cljs watch main worker storybook",
     "clear:shadow-cache": "rm -rf .shadow-cljs",
-    "watch:app": "yarn run clear:shadow-cache && yarn run build:app:worker && concurrently \"yarn run watch:app:main\" \"yarn run watch:app:libs\"",
+    "watch:app": "yarn run clear:shadow-cache && concurrently \"yarn run watch:app:main\" \"yarn run watch:app:libs\"",
     "watch": "yarn run watch:app:assets",
     "watch:storybook": "yarn run build:storybook:assets && concurrently \"storybook dev -p 6006 --no-open\" \"yarn run watch:storybook:assets\"",
     "watch:storybook:assets": "node ./scripts/watch-storybook.js"
   },
   "devDependencies": {
-    "@playwright/test": "1.52.0",
-    "@storybook/addon-docs": "10.0.4",
-    "@storybook/addon-themes": "10.0.4",
-    "@storybook/addon-vitest": "10.0.4",
-    "@storybook/react-vite": "10.0.4",
-    "@types/node": "^22.15.21",
+    "@penpot/draft-js": "portal:./packages/draft-js",
+    "@penpot/mousetrap": "portal:./packages/mousetrap",
+    "@penpot/plugins-runtime": "1.3.2",
+    "@penpot/svgo": "penpot/svgo#v3.1",
+    "@penpot/text-editor": "portal:./text-editor",
+    "@playwright/test": "1.57.0",
+    "@storybook/addon-docs": "10.1.0",
+    "@storybook/addon-themes": "10.1.0",
+    "@storybook/addon-vitest": "10.1.0",
+    "@storybook/react-vite": "10.1.0",
+    "@tokens-studio/sd-transforms": "1.2.11",
+    "@types/node": "^22.19.1",
     "@vitest/browser": "3.2.4",
     "@vitest/coverage-v8": "3.2.4",
-    "autoprefixer": "^10.4.21",
+    "@zip.js/zip.js": "patch:@zip.js/zip.js@npm%3A2.8.11#~/.yarn/patches/@zip.js-zip.js-npm-2.8.11-b131c96df8.patch",
+    "autoprefixer": "^10.4.22",
+    "compression": "^1.8.1",
     "concurrently": "^9.2.1",
-    "esbuild": "^0.25.9",
+    "date-fns": "^4.1.0",
+    "esbuild": "^0.25.12",
+    "eventsource-parser": "^3.0.6",
     "express": "^5.1.0",
     "fancy-log": "^2.0.0",
     "getopts": "^2.3.0",
     "gettext-parser": "^8.0.0",
-    "gulp-concat": "^2.6.1",
-    "gulp-gzip": "^1.4.2",
-    "gulp-mustache": "^5.0.0",
-    "gulp-postcss": "^10.0.0",
-    "gulp-rename": "^2.0.0",
-    "gulp-sourcemaps": "^3.0.0",
-    "gulp-svg-sprite": "^2.0.3",
-    "jsdom": "^27.0.0",
-    "map-stream": "0.0.7",
-    "marked": "^15.0.12",
-    "mkdirp": "^3.0.1",
-    "mustache": "^4.2.0",
-    "nodemon": "^3.1.10",
-    "npm-run-all": "^4.1.5",
-    "p-limit": "^6.2.0",
-    "playwright": "1.56.1",
-    "postcss": "^8.5.4",
-    "postcss-clean": "^1.2.2",
-    "prettier": "3.5.3",
-    "pretty-time": "^1.1.0",
-    "prop-types": "^15.8.1",
-    "rimraf": "^6.0.1",
-    "sass": "^1.89.0",
-    "sass-embedded": "^1.89.0",
-    "storybook": "10.0.4",
-    "svg-sprite": "^2.0.4",
-    "typescript": "^5.9.2",
-    "vite": "^6.3.5",
-    "vitest": "^3.2.0",
-    "wasm-pack": "^0.13.1",
-    "watcher": "^2.3.1",
-    "workerpool": "^9.3.2"
-  },
-  "dependencies": {
-    "@penpot/draft-js": "portal:./vendor/draft-js",
-    "@penpot/hljs": "portal:./vendor/hljs",
-    "@penpot/mousetrap": "portal:./vendor/mousetrap",
-    "@penpot/plugins-runtime": "1.3.2",
-    "@penpot/svgo": "penpot/svgo#v3.1",
-    "@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.8.1",
-    "date-fns": "^4.1.0",
-    "eventsource-parser": "^3.0.6",
+    "highlight.js": "^11.10.0",
     "js-beautify": "^1.15.4",
+    "jsdom": "^27.2.0",
     "lodash": "^4.17.21",
     "lodash.debounce": "^4.0.8",
+    "map-stream": "0.0.7",
+    "marked": "^17.0.1",
+    "mkdirp": "^3.0.1",
+    "mustache": "^4.2.0",
+    "nodemon": "^3.1.11",
+    "npm-run-all": "^4.1.5",
     "opentype.js": "^1.3.4",
+    "p-limit": "^7.2.0",
+    "playwright": "1.57.0",
+    "postcss": "^8.5.6",
+    "postcss-clean": "^1.2.2",
     "postcss-modules": "^6.0.1",
+    "prettier": "3.7.1",
+    "pretty-time": "^1.1.0",
+    "prop-types": "^15.8.1",
     "randomcolor": "^0.6.2",
-    "react": "19.1.1",
-    "react-dom": "19.1.1",
+    "react": "19.2.0",
+    "react-dom": "19.2.0",
     "react-error-boundary": "^6.0.0",
     "react-virtualized": "^9.22.6",
+    "rimraf": "^6.1.2",
     "rxjs": "8.0.0-alpha.14",
-    "sax": "^1.4.1",
+    "sass": "^1.89.0",
+    "sass-embedded": "^1.89.0",
+    "sax": "^1.4.3",
     "source-map-support": "^0.5.21",
+    "storybook": "10.1.0",
     "style-dictionary": "5.0.0-rc.1",
+    "svg-sprite": "^2.0.4",
     "tdigest": "^0.1.2",
     "tinycolor2": "^1.6.0",
-    "ua-parser-js": "2.0.5",
+    "typescript": "^5.9.3",
+    "ua-parser-js": "2.0.6",
+    "vite": "^6.4.1",
+    "vitest": "^3.2.4",
+    "wasm-pack": "^0.13.1",
+    "watcher": "^2.3.1",
+    "workerpool": "^10.0.1",
     "xregexp": "^5.1.2"
   }
 }

frontend/packages/draft-js/index.js

@@ -16,7 +16,9 @@ export const {
   RichTextEditorUtil,
   SelectionState,
   convertFromRaw,
-  convertToRaw
+  convertToRaw,
+  EditorBlock,
+  Editor
 } = pkg;
 
 import DraftPasteProcessor from 'draft-js/lib/DraftPasteProcessor.js';

frontend/packages/draft-js/package.json

@@ -8,7 +8,8 @@
   "author": "Andrey Antukh",
   "license": "MPL-2.0",
   "dependencies": {
-    "draft-js": "penpot/draft-js.git#4a99b2a6020b2af97f6dc5fa1b4275ec16b559a0"
+    "draft-js": "penpot/draft-js.git#4a99b2a6020b2af97f6dc5fa1b4275ec16b559a0",
+    "immutable": "^5.1.4"
   },
   "peerDependencies": {
     "react": ">=0.17.0",

frontend/packages/draft-js/yarn.lock

@@ -173,12 +173,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@penpot/draft-js-wrapper@workspace:.":
+"@penpot/draft-js@workspace:.":
   version: 0.0.0-use.local
-  resolution: "@penpot/draft-js-wrapper@workspace:."
+  resolution: "@penpot/draft-js@workspace:."
   dependencies:
     draft-js: "penpot/draft-js.git#4a99b2a6020b2af97f6dc5fa1b4275ec16b559a0"
     esbuild: "npm:^0.24.0"
+    immutable: "npm:^5.1.4"
   peerDependencies:
     react: ">=0.17.0"
     react-dom: ">=0.17.0"
@@ -320,6 +321,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"immutable@npm:^5.1.4":
+  version: 5.1.4
+  resolution: "immutable@npm:5.1.4"
+  checksum: 10c0/f1c98382e4cde14a0b218be3b9b2f8441888da8df3b8c064aa756071da55fbed6ad696e5959982508456332419be9fdeaf29b2e58d0eadc45483cc16963c0446
+  languageName: node
+  linkType: hard
+
 "immutable@npm:~3.7.4":
   version: 3.7.6
   resolution: "immutable@npm:3.7.6"

frontend/patches/@zip.js__zip.js.patch

@@ -0,0 +1,17 @@
+diff --git a/lib/zip-core-base.js b/lib/zip-core-base.js
+index 142155c8c3ab1a6caa7c370e8a2931a954556ca9..61b0fe6efb91312f437750e0002218f218afad8b 100644
+--- a/lib/zip-core-base.js
++++ b/lib/zip-core-base.js
+@@ -28,12 +28,6 @@
+ 
+ import { configure } from "./core/configuration.js";
+ 
+-try {
+-	configure({ baseURI: import.meta.url });
+-} catch {
+-	// ignored
+-}
+-
+ export * from "./zip-core-reader.js";
+ export * from "./zip-core-writer.js";
+ export {

frontend/playwright/ui/pages/BasePage.js

@@ -73,7 +73,7 @@ export class BasePage {
   }
 
   static async mockConfigFlags(page, flags) {
-    const url = "**/js/config.js?ts=*";
+    const url = "**/js/config.js";
     return await page.route(url, (route) =>
       route.fulfill({
         status: 200,

frontend/pnpm-workspace.yaml

@@ -0,0 +1,6 @@
+patchedDependencies:
+  '@zip.js/zip.js': patches/@zip.js__zip.js.patch
+
+
+shamefullyHoist: true
+recursiveInstall: true

frontend/resources/templates/index.mustache

@@ -25,14 +25,14 @@
     <link rel="icon" href="images/favicon.png" />
     {{# manifest}}
     <script>window.penpotWorkerURI="{{& worker_main}}"</script>
-    <script defer src="{{& config}}"></script>
-    <script defer src="{{& polyfills}}"></script>
+    <script src="{{& config}}"></script>
+    <script src="{{& polyfills}}"></script>
     {{/manifest}}
 
-    <script>
-      window.penpotTranslations = JSON.parse({{& translations}});
-      window.penpotVersion = "%version%";
-      window.penpotBuildDate = "%buildDate%";
+    <script type="module">
+      globalThis.penpotTranslations = JSON.parse({{& translations}});
+      globalThis.penpotVersion = "%version%";
+      globalThis.penpotBuildDate = "%buildDate%";
     </script>
     <!--cookie-consent-->
   </head>
@@ -44,9 +44,11 @@
     <section id="modal"></section>
 
     {{# manifest}}
-    <script defer src="js/libs.js?ts={{& ts}}"></script>
-    <script defer src="{{& shared}}"></script>
-    <script defer src="{{& main}}"></script>
+    <script type="module" src="{{& libs}}"></script>
+    <script type="module">
+      import { init } from "{{& main}}";
+      init();
+    </script>
     {{/manifest}}
   </body>
 </html>

frontend/resources/templates/rasterizer.mustache

@@ -19,9 +19,11 @@
   </head>
   <body>
     {{# manifest}}
-    <script src="js/libs.js?ts={{& ts}}"></script>
-    <script src="{{& shared}}"></script>
-    <script src="{{& rasterizer}}"></script>
+    <script type="module" src="{{& libs}}"></script>
+    <script type="module">
+      import { init } from "{{& rasterizer}}";
+      init();
+    </script>
     {{/manifest}}
   </body>
 </html>

frontend/resources/templates/render.mustache

@@ -18,9 +18,11 @@
   <body>
     <div id="app"></div>
     {{# manifest}}
-    <script src="js/libs.js?ts={{& ts}}"></script>
-    <script src="{{& shared}}"></script>
-    <script src="{{& render}}"></script>
+    <script type="module" src="{{& libs}}"></script>
+    <script type="module">
+      import { init } from "{{& render}}";
+      init();
+    </script>
     {{/manifest}}
   </body>
 </html>

frontend/scripts/_helpers.js

@@ -193,26 +193,30 @@ async function readShadowManifest() {
 
     const index = {
       ts: ts,
-      config: "js/config.js?ts=" + ts,
-      polyfills: "js/polyfills.js?ts=" + ts,
-      worker_main: "js/worker/main.js?ts=" + ts,
+      config: "./js/config.js",
+      polyfills: "./js/polyfills.js",
+      worker_main: "./js/worker/main.js",
+      libs: "./js/libs.js",
     };
 
     for (let item of content) {
-      index[item.name] = "js/" + item["output-name"];
+      index[item.name] = "./js/" + item["output-name"] + "";
     }
 
     return index;
   } catch (cause) {
-    return {
+    const index = {
       ts: ts,
-      config: "js/config.js?ts=" + ts,
-      polyfills: "js/polyfills.js?ts=" + ts,
-      main: "js/main.js?ts=" + ts,
-      shared: "js/shared.js?ts=" + ts,
-      worker_main: "js/worker/main.js?ts=" + ts,
-      rasterizer: "js/rasterizer.js?ts=" + ts,
+      config: "./js/config.js",
+      polyfills: "./js/polyfills.js",
+      main: "./js/main.js",
+      shared: "./js/shared.js",
+      worker_main: "./js/worker/main.js",
+      rasterizer: "./js/rasterizer.js",
+      libs: "./js/libs.js",
     };
+
+    return index;
   }
 }
 

frontend/scripts/build

@@ -26,7 +26,10 @@ yarn install || exit 1;
 rm -rf resources/public;
 rm -rf target/dist;
 
-yarn run build:app:main --config-merge "{:release-version \"${CURRENT_HASH}-${TS}\"}" $EXTRA_PARAMS || exit 1
+mkdir -p resources/public;
+mkdir -p target/dist;
+
+yarn run build:app:main $EXTRA_PARAMS || exit 1
 
 if [ "$INCLUDE_WASM" = "yes" ];  then
     yarn run build:wasm || exit 1;
@@ -35,19 +38,18 @@ fi
 yarn run build:app:libs || exit 1;
 yarn run build:app:assets || exit 1;
 
-mkdir -p target/dist;
-rsync -avr resources/public/ target/dist/
-
-sed -i -re "s/\%version\%/$CURRENT_VERSION/g" ./target/dist/index.html;
-sed -i -re "s/\%version\%/$CURRENT_VERSION/g" ./target/dist/render.html;
-sed -i -re "s/\%version\%/$CURRENT_VERSION/g" ./target/dist/rasterizer.html;
-sed -i -re "s/\%buildDate\%/$BUILD_DATE/g" ./target/dist/index.html;
-sed -i -re "s/\%buildDate\%/$BUILD_DATE/g" ./target/dist/rasterizer.html;
+sed -i -re "s/\%version\%/$CURRENT_VERSION/g" ./resources/public/index.html;
+sed -i -re "s/\%version\%/$CURRENT_VERSION/g" ./resources/public/render.html;
+sed -i -re "s/\%version\%/$CURRENT_VERSION/g" ./resources/public/rasterizer.html;
+sed -i -re "s/\%buildDate\%/$BUILD_DATE/g" ./resources/public/index.html;
+sed -i -re "s/\%buildDate\%/$BUILD_DATE/g" ./resources/public/rasterizer.html;
 
 if [ "$INCLUDE_WASM" = "yes" ];  then
-    sed -i "s/version=develop/version=$CURRENT_VERSION/g" ./target/dist/js/render_wasm.js;
+    sed -i "s/version=develop/version=$CURRENT_VERSION/g" ./resources/public/js/render_wasm.js;
 fi
 
+rsync -avr resources/public/ target/dist/;
+
 if [ "$INCLUDE_STORYBOOK" = "yes" ];  then
     # build storybook
     yarn run build:storybook || exit 1;

frontend/scripts/build-libs.js

@@ -31,9 +31,9 @@ const rebuildNotify = {
 const config = {
   entryPoints: ["target/index.js"],
   bundle: true,
-  format: "iife",
+  format: "esm",
   banner: {
-    js: '"use strict"; var global = globalThis;',
+    js: '"use strict";\nvar global = globalThis;',
   },
   outfile: "resources/public/js/libs.js",
   plugins: [fixReactVirtualized, rebuildNotify],

frontend/scripts/test

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -ex
+corepack enable;
+corepack install;
+yarn install;
+
+yarn run lint:scss;
+yarn run test;

frontend/scripts/test-components

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -ex
+corepack enable;
+corepack install;
+yarn install;
+
+yarn run playwright install chromium --with-deps;
+yarn run build:storybook
+
+exec npx concurrently -k -s first -n "SB,TEST" -c "magenta,blue" \
+    "npx http-server storybook-static --port 6006 --silent" \
+    "npx wait-on tcp:6006 && yarn test:storybook"

frontend/scripts/test-e2e

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -ex
+corepack enable;
+corepack install;
+yarn install;
+yarn run playwright install chromium --with-deps;
+yarn run test:e2e -x --workers=2 --reporter=list "$@";

frontend/shadow-cljs.edn

@@ -6,13 +6,12 @@
 
  :builds
  {:main
-  {:target :browser
+  {:target :esm
    :output-dir "resources/public/js/"
    :asset-path "/js"
    :devtools {:watch-dir "resources/public"
               :reload-strategy :full}
    :build-options {:manifest-name "manifest.json"}
-   :module-loader true
    :modules
    {:shared
     {:entries []}
@@ -20,7 +19,7 @@
     :main
     {:entries [app.main app.plugins.api]
      :depends-on #{:shared}
-     :init-fn app.main/init}
+     :exports {init app.main/init}}
 
     :util-highlight
     {:entries [app.util.code-highlight]
@@ -50,12 +49,12 @@
     :render
     {:entries [app.render]
      :depends-on #{:shared}
-     :init-fn app.render/init}
+     :exports {init app.render/init}}
 
     :rasterizer
     {:entries [app.rasterizer]
      :depends-on #{:shared}
-     :init-fn app.rasterizer/init}}
+     :exports {init app.rasterizer/init}}}
 
    :js-options
    {:entry-keys ["module" "browser" "main"]
@@ -75,11 +74,10 @@
     :compiler-options
     {:fn-invoke-direct true
      :optimizations #shadow/env ["PENPOT_BUILD_OPTIMIZATIONS" :as :keyword :default :advanced]
-     :output-wrapper true
-     :rename-prefix-namespace "PENPOT"
      :source-map true
      :elide-asserts true
      :anon-fn-naming-policy :off
+     :cross-chunk-method-motion false
      :source-map-detail-level :all}}}
 
   :worker

frontend/src/app/main/data/profile.cljs

@@ -8,7 +8,6 @@
   (:require
    [app.common.data :as d]
    [app.common.schema :as sm]
-   [app.common.spec :as us]
    [app.common.types.profile :refer [schema:profile]]
    [app.common.uuid :as uuid]
    [app.config :as cf]
@@ -484,7 +483,7 @@
 
 (defn delete-access-token
   [{:keys [id] :as params}]
-  (us/assert! ::us/uuid id)
+  (assert (uuid? id))
   (ptk/reify ::delete-access-token
     ptk/WatchEvent
     (watch [_ _ _]

frontend/src/app/main/ui.cljs

@@ -31,27 +31,28 @@
    [app.main.ui.static :as static]
    [app.util.dom :as dom]
    [app.util.i18n :refer [tr]]
+   [app.util.modules :as mod]
    [app.util.theme :as theme]
    [beicon.v2.core :as rx]
    [rumext.v2 :as mf]))
 
 (def auth-page
-  (mf/lazy-component app.main.ui.auth/auth))
+  (mf/lazy #(mod/load 'app.main.ui.auth/auth-page*)))
 
-(def verify-token-page
-  (mf/lazy-component app.main.ui.auth.verify-token/verify-token))
+(def verify-token-page*
+  (mf/lazy #(mod/load 'app.main.ui.auth.verify-token/verify-token-page*)))
 
 (def viewer-page*
-  (mf/lazy-component app.main.ui.viewer/viewer*))
+  (mf/lazy #(mod/load 'app.main.ui.viewer/viewer-page*)))
 
 (def dashboard-page*
-  (mf/lazy-component app.main.ui.dashboard/dashboard*))
+  (mf/lazy #(mod/load 'app.main.ui.dashboard/dashboard-page*)))
 
 (def settings-page*
-  (mf/lazy-component app.main.ui.settings/settings*))
+  (mf/lazy #(mod/load 'app.main.ui.settings/settings-page*)))
 
 (def workspace-page*
-  (mf/lazy-component app.main.ui.workspace/workspace*))
+  (mf/lazy #(mod/load 'app.main.ui.workspace/workspace-page*)))
 
 (mf/defc workspace-legacy-redirect*
   {::mf/props :obj
@@ -189,7 +190,7 @@
        [:? [:& auth-page {:route route}]]
 
        :auth-verify-token
-       [:? [:& verify-token-page {:route route}]]
+       [:? [:& verify-token-page* {:route route}]]
 
        (:settings-profile
         :settings-password

frontend/src/app/main/ui/auth.cljs

@@ -19,8 +19,7 @@
    [app.util.i18n :as i18n :refer [tr]]
    [rumext.v2 :as mf]))
 
-(mf/defc auth
-  {::mf/props :obj}
+(mf/defc auth*
   [{:keys [route]}]
   (let [section (dm/get-in route [:data :name])
         is-register (or
@@ -69,3 +68,9 @@
 
       (when (= section :auth-register)
         [:& terms-register])]]))
+
+
+(mf/defc auth-page*
+  {::mf/lazy-load true}
+  [props]
+  [:> auth* props])

frontend/src/app/main/ui/auth/verify_token.cljs

@@ -61,9 +61,9 @@
    (rt/nav :auth-login)
    (ntf/warn (tr "errors.unexpected-token"))))
 
-(mf/defc verify-token
-  [{:keys [route] :as props}]
-  (let [token (get-in route [:query-params :token])
+(mf/defc verify-token*
+  [{:keys [route]}]
+  (let [token     (get-in route [:query-params :token])
         bad-token (mf/use-state false)]
 
     (mf/with-effect []
@@ -99,3 +99,8 @@
       [:> static/invalid-token {}]
       [:> loader*  {:title (tr "labels.loading")
                     :overlay true}])))
+
+(mf/defc verify-token-page*
+  {::mf/lazy-load true}
+  [props]
+  [:> verify-token* props])

frontend/src/app/main/ui/components/code_block.cljs

@@ -8,24 +8,28 @@
   (:require-macros [app.main.style :as stl])
   (:require
    [app.common.data.macros :as dm]
+   [app.util.modules :as modules]
    [cuerdas.core :as str]
    [promesa.core :as p]
-   [rumext.v2 :as mf]
-   [shadow.lazy :as lazy]))
+   [rumext.v2 :as mf]))
 
 (def highlight-fn
-  (lazy/loadable app.util.code-highlight/highlight!))
+  (delay (modules/load-fn 'app.util.code-highlight/highlight!)))
 
 (mf/defc code-block
   {::mf/wrap-props false}
   [{:keys [code type]}]
   (let [block-ref (mf/use-ref)
-        code (str/trim code)]
+        code      (str/trim code)]
 
     (mf/with-effect [code type]
       (when-let [node (mf/ref-val block-ref)]
-        (p/let [highlight-fn (lazy/load highlight-fn)]
-          (highlight-fn node))))
+        (->> @highlight-fn
+             (p/fmap (fn [f] (f)))
+             (p/fnly (fn [f cause]
+                       (if cause
+                         (js/console.error cause)
+                         (f node)))))))
 
     [:pre {:class (dm/str type " " (stl/css :code-display)) :ref block-ref} code]))
 

frontend/src/app/main/ui/dashboard.cljs

@@ -247,7 +247,6 @@
           (swap! storage/session dissoc :template))))))
 
 (mf/defc dashboard*
-  {::mf/props :obj}
   [{:keys [profile project-id team-id search-term plugin-url template section]}]
   (let [team            (mf/deref refs/team)
         projects        (mf/deref refs/projects)
@@ -313,3 +312,8 @@
         :section section
         :search-term search-term
         :team team}]]]))
+
+(mf/defc dashboard-page*
+  {::mf/lazy-load true}
+  [props]
+  [:> dashboard* props])

frontend/src/app/main/ui/settings.cljs

@@ -78,3 +78,9 @@
 
           :settings-notifications
           [:& notifications-page* {:profile profile}])]]]]))
+
+(mf/defc settings-page*
+  {::mf/lazy-load true}
+  [props]
+  [:> settings* props])
+

frontend/src/app/main/ui/viewer.cljs

@@ -624,7 +624,6 @@
 ;; --- Component: Viewer
 
 (mf/defc viewer*
-  {::mf/props :obj}
   [{:keys [file-id share-id page-id] :as props}]
   (mf/with-effect [file-id page-id share-id]
     (let [params {:file-id file-id
@@ -643,3 +642,8 @@
     [:> loader*  {:title (tr "labels.loading")
                   :overlay true}]))
 
+
+(mf/defc viewer-page*
+  {::mf/lazy-load true}
+  [props]
+  [:> viewer* props])

frontend/src/app/main/ui/workspace.cljs

@@ -165,7 +165,7 @@
                    (dsh/lookup-page state file-id page-id))))
              st/state))
 
-(mf/defc workspace-page*
+(mf/defc workspace-inner*
   {::mf/private true}
   [{:keys [page-id file-id file layout wglobal]}]
   (let [page-ref (mf/with-memo [file-id page-id]
@@ -252,10 +252,16 @@
                             :touch-action "none"}}
           [:> context-menu*]
           (if (and file-loaded? page-id)
-            [:> workspace-page*
+            [:> workspace-inner*
              {:page-id page-id
               :file-id file-id
               :file file
               :wglobal wglobal
               :layout layout}]
             [:> workspace-loader*])]]]]]]))
+
+(mf/defc workspace-page*
+  {::mf/lazy-load true}
+  [props]
+  [:> workspace* props])
+

frontend/src/app/main/ui/workspace/shapes/text/editor.cljs

@@ -6,7 +6,7 @@
 
 (ns app.main.ui.workspace.shapes.text.editor
   (:require
-   ["draft-js" :as draft]
+   ["@penpot/draft-js" :as draft]
    [app.common.data :as d]
    [app.common.data.macros :as dm]
    [app.common.geom.point :as gpt]

frontend/src/app/main/ui/workspace/sidebar/assets/common.cljs

@@ -11,7 +11,6 @@
    [app.common.data.macros :as dm]
    [app.common.files.helpers :as cfh]
    [app.common.path-names :as cpn]
-   [app.common.spec :as us]
    [app.common.thumbnails :as thc]
    [app.common.types.component :as ctk]
    [app.common.types.container :as ctn]
@@ -38,7 +37,6 @@
    [app.util.i18n :as i18n :refer [c tr]]
    [app.util.strings :refer [matches-search]]
    [app.util.timers :as ts]
-   [cljs.spec.alpha :as s]
    [cuerdas.core :as str]
    [rumext.v2 :as mf]))
 
@@ -97,10 +95,6 @@
       (str (str/slice (:path asset) (count path)))
       (cpn/merge-path-item (:name asset))))
 
-(s/def ::asset-name ::us/not-empty-string)
-(s/def ::name-group-form
-  (s/keys :req-un [::asset-name]))
-
 (def initial-context-menu-state
   {:open? false :top nil :left nil})
 

frontend/src/app/plugins/comments.cljs

@@ -7,7 +7,7 @@
 (ns app.plugins.comments
   (:require
    [app.common.geom.point :as gpt]
-   [app.common.spec :as us]
+   [app.common.schema :as sm]
    [app.main.data.comments :as dc]
    [app.main.data.helpers :as dsh]
    [app.main.data.workspace.comments :as dwc]
@@ -118,7 +118,8 @@
        (fn [position]
          (let [position (parser/parse-point position)]
            (cond
-             (or (not (us/safe-number? (:x position))) (not (us/safe-number? (:y position))))
+             (or (not (sm/valid-safe-number? (:x position)))
+                 (not (sm/valid-safe-number? (:y position))))
              (u/display-not-valid :position "Not valid point")
 
              (not (r/check-permission plugin-id "comment:write"))

frontend/src/app/plugins/flex.cljs

@@ -7,7 +7,7 @@
 (ns app.plugins.flex
   (:require
    [app.common.data :as d]
-   [app.common.spec :as us]
+   [app.common.schema :as sm]
    [app.common.types.shape.layout :as ctl]
    [app.main.data.workspace.shape-layout :as dwsl]
    [app.main.data.workspace.transforms :as dwt]
@@ -133,7 +133,7 @@
      :set
      (fn [_ value]
        (cond
-         (not (us/safe-int? value))
+         (not (sm/valid-safe-int? value))
          (u/display-not-valid :rowGap value)
 
          (not (r/check-permission plugin-id "content:write"))
@@ -148,7 +148,7 @@
      :set
      (fn [_ value]
        (cond
-         (not (us/safe-int? value))
+         (not (sm/valid-safe-int? value))
          (u/display-not-valid :columnGap value)
 
          (not (r/check-permission plugin-id "content:write"))
@@ -163,7 +163,7 @@
      :set
      (fn [_ value]
        (cond
-         (not (us/safe-int? value))
+         (not (sm/valid-safe-int? value))
          (u/display-not-valid :verticalPadding value)
 
          (not (r/check-permission plugin-id "content:write"))
@@ -178,7 +178,7 @@
      :set
      (fn [_ value]
        (cond
-         (not (us/safe-int? value))
+         (not (sm/valid-safe-int? value))
          (u/display-not-valid :horizontalPadding value)
 
          (not (r/check-permission plugin-id "content:write"))
@@ -194,7 +194,7 @@
      :set
      (fn [_ value]
        (cond
-         (not (us/safe-int? value))
+         (not (sm/valid-safe-int? value))
          (u/display-not-valid :topPadding value)
 
          (not (r/check-permission plugin-id "content:write"))
@@ -209,7 +209,7 @@
      :set
      (fn [_ value]
        (cond
-         (not (us/safe-int? value))
+         (not (sm/valid-safe-int? value))
          (u/display-not-valid :rightPadding value)
 
          (not (r/check-permission plugin-id "content:write"))
@@ -224,7 +224,7 @@
      :set
      (fn [_ value]
        (cond
-         (not (us/safe-int? value))
+         (not (sm/valid-safe-int? value))
          (u/display-not-valid :bottomPadding value)
 
          (not (r/check-permission plugin-id "content:write"))
@@ -239,7 +239,7 @@
      :set
      (fn [_ value]
        (cond
-         (not (us/safe-int? value))
+         (not (sm/valid-safe-int? value))
          (u/display-not-valid :leftPadding value)
 
          (not (r/check-permission plugin-id "content:write"))
@@ -296,7 +296,7 @@
      :set
      (fn [_ value]
        (cond
-         (us/safe-int? value)
+         (sm/valid-safe-int? value)
          (u/display-not-valid :zIndex value)
 
          (not (r/check-permission plugin-id "content:write"))
@@ -359,7 +359,7 @@
      :set
      (fn [_ value]
        (cond
-         (not (us/safe-number? value))
+         (not (sm/valid-safe-number? value))
          (u/display-not-valid :verticalMargin value)
 
          (not (r/check-permission plugin-id "content:write"))
@@ -374,7 +374,7 @@
      :set
      (fn [_ value]
        (cond
-         (not (us/safe-number? value))
+         (not (sm/valid-safe-number? value))
          (u/display-not-valid :horizontalMargin value)
 
          (not (r/check-permission plugin-id "content:write"))
@@ -389,7 +389,7 @@
      :set
      (fn [_ value]
        (cond
-         (not (us/safe-number? value))
+         (not (sm/valid-safe-number? value))
          (u/display-not-valid :topMargin value)
 
          (not (r/check-permission plugin-id "content:write"))
@@ -404,7 +404,7 @@
      :set
      (fn [_ value]
        (cond
-         (not (us/safe-number? value))
+         (not (sm/valid-safe-number? value))
          (u/display-not-valid :rightMargin value)
 
          (not (r/check-permission plugin-id "content:write"))
@@ -419,7 +419,7 @@
      :set
      (fn [_ value]
        (cond
-         (not (us/safe-number? value))
+         (not (sm/valid-safe-number? value))
          (u/display-not-valid :bottomMargin value)
 
          (not (r/check-permission plugin-id "content:write"))
@@ -434,7 +434,7 @@
      :set
      (fn [_ value]
        (cond
-         (not (us/safe-number? value))
+         (not (sm/valid-safe-number? value))
          (u/display-not-valid :leftMargin value)
 
          (not (r/check-permission plugin-id "content:write"))
@@ -449,7 +449,7 @@
      :set
      (fn [_ value]
        (cond
-         (not (us/safe-number? value))
+         (not (sm/valid-safe-number? value))
          (u/display-not-valid :maxWidth value)
 
          (not (r/check-permission plugin-id "content:write"))
@@ -464,7 +464,7 @@
      :set
      (fn [_ value]
        (cond
-         (not (us/safe-number? value))
+         (not (sm/valid-safe-number? value))
          (u/display-not-valid :minWidth value)
 
          (not (r/check-permission plugin-id "content:write"))
@@ -479,7 +479,7 @@
      :set
      (fn [_ value]
        (cond
-         (not (us/safe-number? value))
+         (not (sm/valid-safe-number? value))
          (u/display-not-valid :maxHeight value)
 
          (not (r/check-permission plugin-id "content:write"))
@@ -494,7 +494,7 @@
      :set
      (fn [_ value]
        (cond
-         (not (us/safe-number? value))
+         (not (sm/valid-safe-number? value))
          (u/display-not-valid :minHeight value)
 
          (not (r/check-permission plugin-id "content:write"))

frontend/src/app/plugins/grid.cljs

@@ -7,7 +7,7 @@
 (ns app.plugins.grid
   (:require
    [app.common.data :as d]
-   [app.common.spec :as us]
+   [app.common.schema :as sm]
    [app.common.types.shape.layout :as ctl]
    [app.main.data.workspace.shape-layout :as dwsl]
    [app.main.data.workspace.transforms :as dwt]
@@ -126,7 +126,7 @@
      :set
      (fn [_ value]
        (cond
-         (not (us/safe-int? value))
+         (not (sm/valid-safe-int? value))
          (u/display-not-valid :rowGap value)
 
          (not (r/check-permission plugin-id "content:write"))
@@ -141,7 +141,7 @@
      :set
      (fn [_ value]
        (cond
-         (not (us/safe-int? value))
+         (not (sm/valid-safe-int? value))
          (u/display-not-valid :columnGap value)
 
          (not (r/check-permission plugin-id "content:write"))
@@ -156,7 +156,7 @@
      :set
      (fn [_ value]
        (cond
-         (not (us/safe-int? value))
+         (not (sm/valid-safe-int? value))
          (u/display-not-valid :verticalPadding value)
 
          (not (r/check-permission plugin-id "content:write"))
@@ -171,7 +171,7 @@
      :set
      (fn [_ value]
        (cond
-         (not (us/safe-int? value))
+         (not (sm/valid-safe-int? value))
          (u/display-not-valid :horizontalPadding value)
 
          (not (r/check-permission plugin-id "content:write"))
@@ -186,7 +186,7 @@
      :set
      (fn [_ value]
        (cond
-         (not (us/safe-int? value))
+         (not (sm/valid-safe-int? value))
          (u/display-not-valid :topPadding value)
 
          (not (r/check-permission plugin-id "content:write"))
@@ -201,7 +201,7 @@
      :set
      (fn [_ value]
        (cond
-         (not (us/safe-int? value))
+         (not (sm/valid-safe-int? value))
          (u/display-not-valid :rightPadding value)
 
          (not (r/check-permission plugin-id "content:write"))
@@ -216,7 +216,7 @@
      :set
      (fn [_ value]
        (cond
-         (not (us/safe-int? value))
+         (not (sm/valid-safe-int? value))
          (u/display-not-valid :bottomPadding value)
 
          (not (r/check-permission plugin-id "content:write"))
@@ -231,7 +231,7 @@
      :set
      (fn [_ value]
        (cond
-         (not (us/safe-int? value))
+         (not (sm/valid-safe-int? value))
          (u/display-not-valid :leftPadding value)
 
          (not (r/check-permission plugin-id "content:write"))
@@ -248,7 +248,7 @@
           (u/display-not-valid :addRow-type type)
 
           (and (or (= :percent type) (= :flex type) (= :fixed type))
-               (not (us/safe-number? value)))
+               (not (sm/valid-safe-number? value)))
           (u/display-not-valid :addRow-value value)
 
           (not (r/check-permission plugin-id "content:write"))
@@ -261,14 +261,14 @@
     (fn [index type value]
       (let [type (keyword type)]
         (cond
-          (not (us/safe-int? index))
+          (not (sm/valid-safe-int? index))
           (u/display-not-valid :addRowAtIndex-index index)
 
           (not (contains? ctl/grid-track-types type))
           (u/display-not-valid :addRowAtIndex-type type)
 
           (and (or (= :percent type) (= :flex type) (= :fixed type))
-               (not (us/safe-number? value)))
+               (not (sm/valid-safe-number? value)))
           (u/display-not-valid :addRowAtIndex-value value)
 
           (not (r/check-permission plugin-id "content:write"))
@@ -285,7 +285,7 @@
           (u/display-not-valid :addColumn-type type)
 
           (and (or (= :percent type) (= :flex type) (= :lex type))
-               (not (us/safe-number? value)))
+               (not (sm/valid-safe-number? value)))
           (u/display-not-valid :addColumn-value value)
 
           (not (r/check-permission plugin-id "content:write"))
@@ -297,14 +297,14 @@
     :addColumnAtIndex
     (fn [index type value]
       (cond
-        (not (us/safe-int? index))
+        (not (sm/valid-safe-int? index))
         (u/display-not-valid :addColumnAtIndex-index index)
 
         (not (contains? ctl/grid-track-types type))
         (u/display-not-valid :addColumnAtIndex-type type)
 
         (and (or (= :percent type) (= :flex type) (= :fixed type))
-             (not (us/safe-number? value)))
+             (not (sm/valid-safe-number? value)))
         (u/display-not-valid :addColumnAtIndex-value value)
 
         (not (r/check-permission plugin-id "content:write"))
@@ -317,7 +317,7 @@
     :removeRow
     (fn [index]
       (cond
-        (not (us/safe-int? index))
+        (not (sm/valid-safe-int? index))
         (u/display-not-valid :removeRow index)
 
         (not (r/check-permission plugin-id "content:write"))
@@ -329,7 +329,7 @@
     :removeColumn
     (fn [index]
       (cond
-        (not (us/safe-int? index))
+        (not (sm/valid-safe-int? index))
         (u/display-not-valid :removeColumn index)
 
         (not (r/check-permission plugin-id "content:write"))
@@ -342,14 +342,14 @@
     (fn [index type value]
       (let [type (keyword type)]
         (cond
-          (not (us/safe-int? index))
+          (not (sm/valid-safe-int? index))
           (u/display-not-valid :setColumn-index index)
 
           (not (contains? ctl/grid-track-types type))
           (u/display-not-valid :setColumn-type type)
 
           (and (or (= :percent type) (= :flex type) (= :fixed type))
-               (not (us/safe-number? value)))
+               (not (sm/valid-safe-number? value)))
           (u/display-not-valid :setColumn-value value)
 
           (not (r/check-permission plugin-id "content:write"))
@@ -362,14 +362,14 @@
     (fn [index type value]
       (let [type (keyword type)]
         (cond
-          (not (us/safe-int? index))
+          (not (sm/valid-safe-int? index))
           (u/display-not-valid :setRow-index index)
 
           (not (contains? ctl/grid-track-types type))
           (u/display-not-valid :setRow-type type)
 
           (and (or (= :percent type) (= :flex type) (= :fixed type))
-               (not (us/safe-number? value)))
+               (not (sm/valid-safe-number? value)))
           (u/display-not-valid :setRow-value value)
 
           (not (r/check-permission plugin-id "content:write"))
@@ -393,10 +393,10 @@
         (not (shape-proxy? child))
         (u/display-not-valid :appendChild-child child)
 
-        (or (< row 0) (not (us/safe-int? row)))
+        (or (< row 0) (not (sm/valid-safe-int? row)))
         (u/display-not-valid :appendChild-row row)
 
-        (or (< column 0) (not (us/safe-int? column)))
+        (or (< column 0) (not (sm/valid-safe-int? column)))
         (u/display-not-valid :appendChild-column column)
 
         (not (r/check-permission plugin-id "content:write"))
@@ -431,7 +431,7 @@
          (let [cell (locate-cell self)
                shape (u/proxy->shape self)]
            (cond
-             (not (us/safe-int? value))
+             (not (sm/valid-safe-int? value))
              (u/display-not-valid :row-value value)
 
              (nil? cell)
@@ -451,7 +451,7 @@
          (let [shape (u/proxy->shape self)
                cell (locate-cell self)]
            (cond
-             (not (us/safe-int? value))
+             (not (sm/valid-safe-int? value))
              (u/display-not-valid :rowSpan-value value)
 
              (nil? cell)
@@ -471,7 +471,7 @@
          (let [shape (u/proxy->shape self)
                cell (locate-cell self)]
            (cond
-             (not (us/safe-int? value))
+             (not (sm/valid-safe-int? value))
              (u/display-not-valid :column-value value)
 
              (nil? cell)
@@ -491,7 +491,7 @@
          (let [shape (u/proxy->shape self)
                cell (locate-cell self)]
            (cond
-             (not (us/safe-int? value))
+             (not (sm/valid-safe-int? value))
              (u/display-not-valid :columnSpan-value value)
 
              (nil? cell)

frontend/src/app/plugins/page.cljs

@@ -10,7 +10,7 @@
    [app.common.data.macros :as dm]
    [app.common.files.helpers :as cfh]
    [app.common.geom.point :as gpt]
-   [app.common.spec :as us]
+   [app.common.schema :as sm]
    [app.common.types.color :as cc]
    [app.common.uuid :as uuid]
    [app.main.data.comments :as dc]
@@ -299,7 +299,7 @@
     (fn [orientation value board]
       (let [shape (u/proxy->shape board)]
         (cond
-          (not (us/safe-number? value))
+          (not (sm/valid-safe-number? value))
           (u/display-not-valid :addRulerGuide "Value not a safe number")
 
           (not (contains? #{"vertical" "horizontal"} orientation))
@@ -345,8 +345,8 @@
           (or (not (string? content)) (empty? content))
           (u/display-not-valid :addCommentThread "Content not valid")
 
-          (or (not (us/safe-number? (:x position)))
-              (not (us/safe-number? (:y position))))
+          (or (not (sm/valid-safe-number? (:x position)))
+              (not (sm/valid-safe-number? (:y position))))
           (u/display-not-valid :addCommentThread "Position not valid")
 
           (and (some? board) (or (not (shape/shape-proxy? board)) (not (cfh/frame-shape? shape))))

frontend/src/app/plugins/ruler_guides.cljs

@@ -8,7 +8,7 @@
   (:require
    [app.common.data.macros :as dm]
    [app.common.files.helpers :as cfh]
-   [app.common.spec :as us]
+   [app.common.schema :as sm]
    [app.main.data.workspace.guides :as dwgu]
    [app.main.store :as st]
    [app.plugins.format :as format]
@@ -77,7 +77,7 @@
      :set
      (fn [self value]
        (cond
-         (not (us/safe-number? value))
+         (not (sm/valid-safe-number? value))
          (u/display-not-valid :position "Not valid position")
 
          (not (r/check-permission plugin-id "content:write"))

frontend/src/app/plugins/shape.cljs

@@ -14,7 +14,6 @@
    [app.common.path-names :as cpn]
    [app.common.record :as crc]
    [app.common.schema :as sm]
-   [app.common.spec :as us]
    [app.common.svg.path :as svg.path]
    [app.common.types.color :as clr]
    [app.common.types.component :as ctk]
@@ -325,7 +324,7 @@
             (fn [self value]
               (let [id (obj/get self "$id")]
                 (cond
-                  (or (not (us/safe-int? value)) (< value 0))
+                  (or (not (sm/valid-safe-int? value)) (< value 0))
                   (u/display-not-valid :borderRadius value)
 
                   (not (r/check-permission plugin-id "content:write"))
@@ -341,7 +340,7 @@
             (fn [self value]
               (let [id (obj/get self "$id")]
                 (cond
-                  (not (us/safe-int? value))
+                  (not (sm/valid-safe-int? value))
                   (u/display-not-valid :borderRadiusTopLeft value)
 
                   (not (r/check-permission plugin-id "content:write"))
@@ -357,7 +356,7 @@
             (fn [self value]
               (let [id (obj/get self "$id")]
                 (cond
-                  (not (us/safe-int? value))
+                  (not (sm/valid-safe-int? value))
                   (u/display-not-valid :borderRadiusTopRight value)
 
                   (not (r/check-permission plugin-id "content:write"))
@@ -373,7 +372,7 @@
             (fn [self value]
               (let [id (obj/get self "$id")]
                 (cond
-                  (not (us/safe-int? value))
+                  (not (sm/valid-safe-int? value))
                   (u/display-not-valid :borderRadiusBottomRight value)
 
                   (not (r/check-permission plugin-id "content:write"))
@@ -389,7 +388,7 @@
             (fn [self value]
               (let [id (obj/get self "$id")]
                 (cond
-                  (not (us/safe-int? value))
+                  (not (sm/valid-safe-int? value))
                   (u/display-not-valid :borderRadiusBottomLeft value)
 
                   (not (r/check-permission plugin-id "content:write"))
@@ -405,7 +404,7 @@
             (fn [self value]
               (let [id (obj/get self "$id")]
                 (cond
-                  (or (not (us/safe-number? value)) (< value 0) (> value 1))
+                  (or (not (sm/valid-safe-number? value)) (< value 0) (> value 1))
                   (u/display-not-valid :opacity value)
 
                   (not (r/check-permission plugin-id "content:write"))
@@ -492,7 +491,7 @@
             (fn [self value]
               (let [id (obj/get self "$id")]
                 (cond
-                  (not (us/safe-number? value))
+                  (not (sm/valid-safe-number? value))
                   (u/display-not-valid :x value)
 
                   (not (r/check-permission plugin-id "content:write"))
@@ -510,7 +509,7 @@
             (fn [self value]
               (let [id (obj/get self "$id")]
                 (cond
-                  (not (us/safe-number? value))
+                  (not (sm/valid-safe-number? value))
                   (u/display-not-valid :y value)
 
                   (not (r/check-permission plugin-id "content:write"))
@@ -555,7 +554,7 @@
             :set
             (fn [self value]
               (cond
-                (not (us/safe-number? value))
+                (not (sm/valid-safe-number? value))
                 (u/display-not-valid :parentX value)
 
                 (not (r/check-permission plugin-id "content:write"))
@@ -582,7 +581,7 @@
             :set
             (fn [self value]
               (cond
-                (not (us/safe-number? value))
+                (not (sm/valid-safe-number? value))
                 (u/display-not-valid :parentY value)
 
                 (not (r/check-permission plugin-id "content:write"))
@@ -609,7 +608,7 @@
             :set
             (fn [self value]
               (cond
-                (not (us/safe-number? value))
+                (not (sm/valid-safe-number? value))
                 (u/display-not-valid :frameX value)
 
                 (not (r/check-permission plugin-id "content:write"))
@@ -636,7 +635,7 @@
             :set
             (fn [self value]
               (cond
-                (not (us/safe-number? value))
+                (not (sm/valid-safe-number? value))
                 (u/display-not-valid :frameY value)
 
                 (not (r/check-permission plugin-id "content:write"))
@@ -795,10 +794,10 @@
            :resize
            (fn [width height]
              (cond
-               (or (not (us/safe-number? width)) (<= width 0))
+               (or (not (sm/valid-safe-number? width)) (<= width 0))
                (u/display-not-valid :resize width)
 
-               (or (not (us/safe-number? height)) (<= height 0))
+               (or (not (sm/valid-safe-number? height)) (<= height 0))
                (u/display-not-valid :resize height)
 
                (not (r/check-permission plugin-id "content:write"))
@@ -1048,10 +1047,10 @@
                  (not (cfh/text-shape? shape))
                  (u/display-not-valid :getRange-shape "shape is not text")
 
-                 (or (not (us/safe-int? start)) (< start 0) (> start end))
+                 (or (not (sm/valid-safe-int? start)) (< start 0) (> start end))
                  (u/display-not-valid :getRange-start start)
 
-                 (not (us/safe-int? end))
+                 (not (sm/valid-safe-int? end))
                  (u/display-not-valid :getRange-end end)
 
                  :else
@@ -1078,7 +1077,7 @@
            :setParentIndex
            (fn [index]
              (cond
-               (not (us/safe-int? index))
+               (not (sm/valid-safe-int? index))
                (u/display-not-valid :setParentIndex index)
 
                (not (r/check-permission plugin-id "content:write"))
@@ -1230,7 +1229,7 @@
            (fn [orientation value]
              (let [shape (u/locate-shape file-id page-id id)]
                (cond
-                 (not (us/safe-number? value))
+                 (not (sm/valid-safe-number? value))
                  (u/display-not-valid :addRulerGuide "Value not a safe number")
 
                  (not (contains? #{"vertical" "horizontal"} orientation))

frontend/src/app/plugins/viewport.cljs

@@ -7,7 +7,7 @@
 (ns app.plugins.viewport
   (:require
    [app.common.data.macros :as dm]
-   [app.common.spec :as us]
+   [app.common.schema :as sm]
    [app.main.data.workspace.viewport :as dwv]
    [app.main.data.workspace.zoom :as dwz]
    [app.main.store :as st]
@@ -37,10 +37,10 @@
        (let [new-x (obj/get value "x")
              new-y (obj/get value "y")]
          (cond
-           (not (us/safe-number? new-x))
+           (not (sm/valid-safe-number? new-x))
            (u/display-not-valid :center-x new-x)
 
-           (not (us/safe-number? new-y))
+           (not (sm/valid-safe-number? new-y))
            (u/display-not-valid :center-y new-y)
 
            :else
@@ -62,7 +62,7 @@
      :set
      (fn [value]
        (cond
-         (not (us/safe-number? value))
+         (not (sm/valid-safe-number? value))
          (u/display-not-valid :zoom value)
 
          :else

frontend/src/app/render.cljs

@@ -125,47 +125,40 @@
    [:embed {:optional true} :boolean]
    [:skip-children {:optional true} :boolean]
    [:object-id
-    [:or
-     ::sm/uuid
-     ::sm/coll-of-uuid]]])
+    [:or [::sm/set ::sm/uuid] ::sm/uuid]]])
 
-(def ^:private render-objects-decoder
-  (sm/lazy-decoder schema:render-objects
-                   sm/string-transformer))
-
-(def ^:private render-objects-validator
-  (sm/lazy-validator schema:render-objects))
+(def ^:private coerce-render-objects-params
+  (sm/coercer schema:render-objects))
 
 (defn- render-objects
   [params]
-  (let [{:keys [file-id page-id embed share-id object-id skip-children] :as params} (render-objects-decoder params)]
-    (if-not (render-objects-validator params)
-      (do
-        (js/console.error "invalid arguments")
-        (sm/pretty-explain schema:render-objects params)
-        nil)
+  (try
+    (let [{:keys [file-id page-id embed share-id object-id skip-children] :as params}
+          (coerce-render-objects-params params)]
+      (st/emit! (fetch-objects-bundle :file-id file-id :page-id page-id :share-id share-id :object-id object-id))
+      (if (uuid? object-id)
+        (mf/html
+         [:& object-svg
+          {:file-id file-id
+           :page-id page-id
+           :share-id share-id
+           :object-id object-id
+           :embed embed
+           :skip-children skip-children}])
 
-      (do
-        (st/emit! (fetch-objects-bundle :file-id file-id :page-id page-id :share-id share-id :object-id object-id))
-
-        (if (uuid? object-id)
-          (mf/html
-           [:& object-svg
-            {:file-id file-id
-             :page-id page-id
-             :share-id share-id
-             :object-id object-id
-             :embed embed
-             :skip-children skip-children}])
-
-          (mf/html
-           [:& objects-svg
-            {:file-id file-id
-             :page-id page-id
-             :share-id share-id
-             :object-ids (into #{} object-id)
-             :embed embed
-             :skip-children skip-children}]))))))
+        (mf/html
+         [:& objects-svg
+          {:file-id file-id
+           :page-id page-id
+           :share-id share-id
+           :object-ids (into #{} object-id)
+           :embed embed
+           :skip-children skip-children}])))
+    (catch :default cause
+      (when-let [explain (-> cause ex-data ::sm/explain)]
+        (js/console.log "Unexpected error")
+        (js/console.log (sm/humanize-explain explain)))
+      (mf/html [:span "Unexpected error:" (ex-message cause)]))))
 
 ;; ---- COMPONENTS SPRITE
 
@@ -242,39 +235,37 @@
    [:embed {:optional true} :boolean]
    [:component-id {:optional true} ::sm/uuid]])
 
-(def ^:private render-components-decoder
-  (sm/lazy-decoder schema:render-components
-                   sm/string-transformer))
-
-(def ^:private render-components-validator
-  (sm/lazy-validator schema:render-components))
+(def ^:private coerce-render-components-params
+  (sm/coercer schema:render-components))
 
 (defn render-components
   [params]
-  (let [{:keys [file-id component-id embed] :as params} (render-components-decoder params)]
-    (if-not (render-components-validator params)
-      (do
-        (js/console.error "invalid arguments")
-        (sm/pretty-explain schema:render-components params)
-        nil)
+  (try
+    (let [{:keys [file-id component-id embed] :as params}
+          (coerce-render-components-params params)]
 
-      (do
-        (st/emit! (ptk/reify ::initialize-render-components
-                    ptk/WatchEvent
-                    (watch [_ _ stream]
-                      (rx/merge
-                       (rx/of (fetch-team :file-id file-id))
+      (st/emit! (ptk/reify ::initialize-render-components
+                  ptk/WatchEvent
+                  (watch [_ _ stream]
+                    (rx/merge
+                     (rx/of (fetch-team :file-id file-id))
 
-                       (->> stream
-                            (rx/filter (ptk/type? ::team-fetched))
-                            (rx/observe-on :async)
-                            (rx/map (constantly params))
-                            (rx/map fetch-components-bundle))))))
+                     (->> stream
+                          (rx/filter (ptk/type? ::team-fetched))
+                          (rx/observe-on :async)
+                          (rx/map (constantly params))
+                          (rx/map fetch-components-bundle))))))
 
-        (mf/html
-         [:& components-svg
-          {:component-id component-id
-           :embed embed}])))))
+      (mf/html
+       [:& components-svg
+        {:component-id component-id
+         :embed embed}]))
+
+    (catch :default cause
+      (when-let [explain (-> cause ex-data ::sm/explain)]
+        (js/console.log "Unexpected error")
+        (js/console.log (sm/humanize-explain explain)))
+      (mf/html [:span "Unexpected error:" (ex-message cause)]))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; SETUP

frontend/src/app/render_wasm/api.cljs

@@ -40,6 +40,7 @@
    [app.util.debug :as dbg]
    [app.util.functions :as fns]
    [app.util.globals :as ug]
+   [app.util.modules :as mod]
    [app.util.text.content :as tc]
    [beicon.v2.core :as rx]
    [promesa.core :as p]
@@ -1361,7 +1362,7 @@
   (delay
     (if (exists? js/dynamicImport)
       (let [uri (cf/resolve-static-asset "js/render_wasm.js")]
-        (->> (js/dynamicImport (str uri))
+        (->> (mod/import uri)
              (p/mcat init-wasm-module)
              (p/fmap
               (fn [default]

frontend/src/app/util/code_highlight.cljs

@@ -6,10 +6,11 @@
 
 (ns app.util.code-highlight
   (:require
-   ["@penpot/hljs" :as hljs]
+   ["highlight.js$default" :as hljs]
    [app.util.dom :as dom]))
 
 (defn highlight!
+  {:lazy-loadable true}
   [node]
   (dom/set-data! node "highlighted" nil)
   (hljs/highlightElement node))

frontend/src/app/util/globals.js

@@ -20,7 +20,7 @@ goog.provide("app.util.globals");
 goog.scope(function () {
   var self = app.util.globals;
 
-  self.global = goog.global;
+  self.global = globalThis;
 
   function createMockedEventEmitter(k) {
     /* Allow mocked objects to be event emitters, so other modules

frontend/src/app/util/i18n.cljs

@@ -92,8 +92,9 @@
   is executed in the critical part (application bootstrap) and used in
   many parts of the application."
   [data]
-  (reset! locale (or (get storage/global ::locale) (autodetect)))
-  (set! translations data))
+  (set! translations data)
+  (reset! locale (or (get storage/global ::locale) (autodetect))))
+
 
 (defn set-locale!
   [lname]

frontend/src/app/util/modules.clj

@@ -0,0 +1,17 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns app.util.modules
+  (:refer-clojure :exclude [load resolve]))
+
+(defmacro load
+  [thing]
+  `(-> (shadow.esm/load-by-name ~thing)
+       (.then (fn [f#] (cljs.core/js-obj "default" (f#))))))
+
+(defmacro load-fn
+  [thing]
+  `(shadow.esm/load-by-name ~thing))

frontend/src/app/util/modules.cljs

@@ -0,0 +1,16 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns app.util.modules
+  (:refer-clojure :exclude [import])
+  (:require-macros [app.util.modules])
+  (:require
+   [shadow.esm :refer [dynamic-import]]))
+
+(defn import
+  "Dynamic esm module import import"
+  [path]
+  (dynamic-import (str path)))

frontend/src/app/util/worker.cljs

@@ -101,8 +101,8 @@
               (rx/push! bus message))))
 
         handle-error
-        (fn [error]
-          (on-error worker (.-data error)))]
+        (fn [event]
+          (on-error worker (.-data event)))]
 
     (.addEventListener instance "message" handle-message)
     (.addEventListener instance "error" handle-error)

frontend/src/app/worker/thumbnails.cljs

@@ -20,12 +20,12 @@
    [app.render-wasm.api :as wasm.api]
    [app.render-wasm.wasm :as wasm]
    [app.util.http :as http]
+   [app.util.modules :as mod]
    [app.worker.impl :as impl]
    [beicon.v2.core :as rx]
    [okulary.core :as l]
    [promesa.core :as p]
-   [rumext.v2 :as mf]
-   [shadow.esm :refer (dynamic-import)]))
+   [rumext.v2 :as mf]))
 
 (log/set-level! :trace)
 
@@ -101,7 +101,7 @@
 (def init-wasm
   (delay
     (let [uri (cf/resolve-static-asset "js/render_wasm.js")]
-      (-> (dynamic-import (str uri))
+      (-> (mod/import (str uri))
           (p/then #(wasm.api/init-wasm-module %))
           (p/then #(set! wasm/internal-module %))))))
 

frontend/vendor/hljs/index.js

@@ -1,5 +0,0 @@
-import h from "highlight.js";
-
-export function highlightElement(node) {
-  return h.highlightElement(node);
-}

frontend/vendor/hljs/package.json

@@ -1,13 +0,0 @@
-{
-  "name": "@penpot/hljs",
-  "version": "1.0.0",
-  "description": "Penpot Hightlight.js ESM wrapper",
-  "main": "index.js",
-  "packageManager": "yarn@4.3.1",
-  "author": "Andrey Antukh",
-  "license": "MPL-2.0",
-  "type": "module",
-  "dependencies": {
-    "highlight.js": "^11.10.0"
-  }
-}

frontend/vendor/hljs/yarn.lock

@@ -1,21 +0,0 @@
-# This file is generated by running "yarn install" inside your project.
-# Manual changes might be lost - proceed with caution!
-
-__metadata:
-  version: 8
-  cacheKey: 10c0
-
-"@penpot/hljs@workspace:.":
-  version: 0.0.0-use.local
-  resolution: "@penpot/hljs@workspace:."
-  dependencies:
-    highlight.js: "npm:^11.10.0"
-  languageName: unknown
-  linkType: soft
-
-"highlight.js@npm:^11.10.0":
-  version: 11.10.0
-  resolution: "highlight.js@npm:11.10.0"
-  checksum: 10c0/cd8bf7ef06cbd72ddb83580ecabe769f08f062be8bb82d2eb492d31c17f7480d1f8d14a66fc81deee0601645435f19f04c470510563f847242a41ccff0ab873e
-  languageName: node
-  linkType: hard

frontend/vendor/tubax/saxjs.cljs

@@ -1,4 +0,0 @@
-(ns tubax.saxjs
-  (:require ["sax" :as sax]))
-
-(goog/exportSymbol "sax" sax)

library/scripts/test

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -ex
+corepack enable;
+corepack install;
+yarn install;
+
+yarn run build:bundle;
+yarn run test;

package.json

@@ -11,14 +11,8 @@
   },
   "type": "module",
   "scripts": {
-    "fmt:clj:check": "cljfmt check --parallel=true common/src/ common/test/ frontend/src/ frontend/test/ backend/src/ backend/test/ exporter/src/ library/src",
-    "fmt:clj": "cljfmt fix --parallel=true common/src/ common/test/ frontend/src/ frontend/test/ backend/src/ backend/test/ exporter/src/ library/src",
-    "lint:clj:common": "clj-kondo --parallel=true --lint common/src",
-    "lint:clj:frontend": "clj-kondo --parallel=true --lint frontend/src",
-    "lint:clj:backend": "clj-kondo --parallel=true --lint backend/src",
-    "lint:clj:exporter": "clj-kondo --parallel=true --lint exporter/src",
-    "lint:clj:library": "clj-kondo --parallel=true --lint library/src",
-    "lint:clj": "yarn run lint:clj:common && yarn run lint:clj:frontend && yarn run lint:clj:backend && yarn run lint:clj:exporter && yarn run lint:clj:library"
+    "lint": "./scripts/lint",
+    "fmt": "./scripts/fmt"
   },
   "devDependencies": {
     "@types/node": "^20.12.7"

scripts/fmt

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -ex
+
+cljfmt --parallel=true \
+       common/src/ \
+       common/test/ \
+       frontend/src/ \
+       frontend/test/ \
+       backend/src/ \
+       backend/test/ \
+       exporter/src/ \
+       library/src;

scripts/lint

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+set -ex
+
+cljfmt check --parallel=true \
+       common/src/ \
+       common/test/ \
+       frontend/src/ \
+       frontend/test/ \
+       backend/src/ \
+       backend/test/ \
+       exporter/src/ \
+       library/src;
+
+clj-kondo --parallel=true --lint common/src;
+clj-kondo --parallel=true --lint frontend/src;
+clj-kondo --parallel=true --lint backend/src;
+clj-kondo --parallel=true --lint exporter/src/;
+clj-kondo --parallel=true --lint library/src;