Merge remote-tracking branch 'origin/staging'

📚 Fix oidc callback related documentation issue
Merge pull request #8134 from penpot/alotor-fix-plugins-export
2026-01-21 04:40:48 -05:00 · 2026-01-20 16:25:10 +01:00 · 2026-01-20 16:24:12 +01:00 · 2026-01-20 15:03:04 +01:00 · 2026-01-20 13:25:55 +01:00 · 2026-01-20 12:26:55 +01:00
22 changed files with 128 additions and 187 deletions
--- a/docker/images/docker-compose.yaml
+++ b/docker/images/docker-compose.yaml
@@ -152,9 +152,9 @@ services:

      # AWS_ACCESS_KEY_ID: <KEY_ID>
      # AWS_SECRET_ACCESS_KEY: <ACCESS_KEY>
-      # PENPOT_ASSETS_STORAGE_BACKEND: assets-s3
-      # PENPOT_STORAGE_ASSETS_S3_ENDPOINT: <ENDPOINT>
-      # PENPOT_STORAGE_ASSETS_S3_BUCKET: <BUKET_NAME>
+      # PENPOT_OBJECTS_STORAGE_BACKEND: s3
+      # PENPOT_OBJECTS_STORAGE_S3_ENDPOINT: <ENDPOINT>
+      # PENPOT_OBJECTS_STORAGE_S3_BUCKET: <BUKET_NAME>

      ## Telemetry. When enabled, a periodical process will send anonymous data about this
      ## instance. Telemetry data will enable us to learn how the application is used,
--- a/docs/technical-guide/configuration.md
+++ b/docs/technical-guide/configuration.md
@@ -114,14 +114,7 @@ configuration.
 The callback has the following format:

 ```html
-https://<your_domain>/api/auth/oauth/<oauth_provider>/callback
-```
-
-You will need to change <your_domain> and <oauth_provider> according to your setup.
-This is how it looks with Gitlab provider:
-
-```html
-https://<your_domain>/api/auth/oauth/gitlab/callback
+https://<your_domain>/api/auth/oidc/callback
 ```

 #### Google
--- a/frontend/resources/templates/index.mustache
+++ b/frontend/resources/templates/index.mustache
@@ -17,17 +17,18 @@
    <meta name="twitter:site" content="@penpotapp">
    <meta name="twitter:creator" content="@penpotapp">
    <meta name="theme-color" content="#FFFFFF" media="(prefers-color-scheme: light)">
-    <link id="theme" href="css/main.css?version={{& version}}" rel="stylesheet" type="text/css" />
+    <link id="theme" href="css/main.css?version={{& version_tag}}" rel="stylesheet" type="text/css" />
    {{#isDebug}}
-    <link href="css/debug.css?version={{& version}}" rel="stylesheet" type="text/css" />
+    <link href="css/debug.css?version={{& version_tag}}" rel="stylesheet" type="text/css" />
    {{/isDebug}}

-    <link rel="icon" href="images/favicon.png" />
+    <link rel="icon" href="images/favicon.png?version={{& version_tag }}" />

    <script type="importmap">{{& manifest.importmap }}</script>

    <script type="module">
      globalThis.penpotVersion = "{{& version}}";
+      globalThis.penpotVersionTag = "{{& version_tag}}";
      globalThis.penpotBuildDate = "{{& build_date}}";
      globalThis.penpotWorkerURI = "{{& manifest.worker_main}}";
    </script>
--- a/frontend/resources/templates/rasterizer.mustache
+++ b/frontend/resources/templates/rasterizer.mustache
@@ -3,10 +3,11 @@
  <head>
    <meta charset="utf-8" />
    <title>Penpot - Rasterizer</title>
-    <link rel="icon" href="images/favicon.png" />
+    <link rel="icon" href="images/favicon.png?version={{& version_tag }}" />

    <script>
      globalThis.penpotVersion = "{{& version}}";
+      globalThis.penpotVersionTag = "{{& version_tag}}";
      globalThis.penpotBuildDate = "{{& build_date}}";
      globalThis.penpotWorkerURI = "{{& manifest.worker_main}}";
    </script>
--- a/frontend/resources/templates/render.mustache
+++ b/frontend/resources/templates/render.mustache
@@ -4,10 +4,12 @@
    <meta charset="utf-8" />
    <meta http-equiv="x-ua-compatible" content="ie=edge" />
    <title>Penpot - Render</title>
-    <link rel="icon" href="images/favicon.png" />
+
+    <link rel="icon" href="images/favicon.png?version={{& version_tag }}" />

    <script>
      globalThis.penpotVersion = "{{& version}}";
+      globalThis.penpotVersionTag = "{{& version_tag}}";
      globalThis.penpotBuildDate = "{{& build_date}}";
    </script>

--- a/frontend/scripts/_helpers.js
+++ b/frontend/scripts/_helpers.js
@@ -27,9 +27,11 @@ export function startWorker() {
  });
 }

-export const isDebug = process.env.NODE_ENV !== "production";
-export const CURRENT_VERSION = process.env.CURRENT_VERSION || "develop";
-export const BUILD_DATE = process.env.BUILD_DATE || "" + new Date();
+export const IS_DEBUG = process.env.NODE_ENV !== "production";
+export const BUILD_DATE = process.env.BUILD_DATE || (new Date().toString()) ;
+export const BUILD_TS = process.env.BUILD_TS || Date.now();
+export const VERSION = process.env.VERSION || "develop";
+export const VERSION_TAG = process.env.VERSION_TAG || VERSION;

 async function findFiles(basePath, predicate, options = {}) {
  predicate =
@@ -193,25 +195,25 @@ async function generateManifest() {
    render_main: "./js/render.js",
    rasterizer_main: "./js/rasterizer.js",

-    config: "./js/config.js?version=" + CURRENT_VERSION,
-    polyfills: "./js/polyfills.js?version=" + CURRENT_VERSION,
-    libs: "./js/libs.js?version=" + CURRENT_VERSION,
-    worker_main: "./js/worker/main.js?version=" + CURRENT_VERSION,
-    default_translations: "./js/translation.en.js?version=" + CURRENT_VERSION,
+    config: "./js/config.js?version=" + VERSION_TAG,
+    polyfills: "./js/polyfills.js?version=" + VERSION_TAG,
+    libs: "./js/libs.js?version=" + VERSION_TAG,
+    worker_main: "./js/worker/main.js?version=" + VERSION_TAG,
+    default_translations: "./js/translation.en.js?version=" + VERSION_TAG,

    importmap: JSON.stringify({
      "imports": {
-        "./js/shared.js": "./js/shared.js?version=" + CURRENT_VERSION,
-        "./js/main.js": "./js/main.js?version=" + CURRENT_VERSION,
-        "./js/render.js": "./js/render.js?version=" + CURRENT_VERSION,
-        "./js/render-wasm.js": "./js/render-wasm.js?version=" + CURRENT_VERSION,
-        "./js/rasterizer.js": "./js/rasterizer.js?version=" + CURRENT_VERSION,
-        "./js/main-dashboard.js": "./js/main-dashboard.js?version=" + CURRENT_VERSION,
-        "./js/main-auth.js": "./js/main-auth.js?version=" + CURRENT_VERSION,
-        "./js/main-viewer.js": "./js/main-viewer.js?version=" + CURRENT_VERSION,
-        "./js/main-settings.js": "./js/main-settings.js?version=" + CURRENT_VERSION,
-        "./js/main-workspace.js": "./js/main-workspace.js?version=" + CURRENT_VERSION,
-        "./js/util-highlight.js": "./js/util-highlight.js?version=" + CURRENT_VERSION
+        "./js/shared.js": "./js/shared.js?version=" + VERSION_TAG,
+        "./js/main.js": "./js/main.js?version=" + VERSION_TAG,
+        "./js/render.js": "./js/render.js?version=" + VERSION_TAG,
+        "./js/render-wasm.js": "./js/render-wasm.js?version=" + VERSION_TAG,
+        "./js/rasterizer.js": "./js/rasterizer.js?version=" + VERSION_TAG,
+        "./js/main-dashboard.js": "./js/main-dashboard.js?version=" + VERSION_TAG,
+        "./js/main-auth.js": "./js/main-auth.js?version=" + VERSION_TAG,
+        "./js/main-viewer.js": "./js/main-viewer.js?version=" + VERSION_TAG,
+        "./js/main-settings.js": "./js/main-settings.js?version=" + VERSION_TAG,
+        "./js/main-workspace.js": "./js/main-workspace.js?version=" + VERSION_TAG,
+        "./js/util-highlight.js": "./js/util-highlight.js?version=" + VERSION_TAG
      }
    })
  };
@@ -222,11 +224,12 @@ async function generateManifest() {
 async function renderTemplate(path, context = {}, partials = {}) {
  const content = await fs.readFile(path, { encoding: "utf-8" });

-  const ts = Math.floor(new Date());
-
  context = Object.assign({}, context, {
-    ts: ts,
-    isDebug,
+    isDebug: IS_DEBUG,
+    version: VERSION,
+    version_tag: VERSION_TAG,
+    build_date: BUILD_DATE,
+    build_ts: BUILD_TS,
  });

  return mustache.render(content, context, partials);
@@ -390,7 +393,6 @@ async function generateSvgSprites() {
 }

 async function generateTemplates() {
-  const isDebug = process.env.NODE_ENV !== "production";
  await fs.mkdir("./resources/public/", { recursive: true });

  const manifest = await generateManifest();
@@ -415,10 +417,7 @@ async function generateTemplates() {
  };

  const context = {
-    manifest: manifest,
-    version: CURRENT_VERSION,
-    build_date: BUILD_DATE,
-    isDebug,
+    manifest: manifest
  };

  content = await renderTemplate(
@@ -487,7 +486,7 @@ export async function compileStyles() {
  await fs.mkdir("./resources/public/css", { recursive: true });
  await fs.writeFile("./resources/public/css/main.css", result);

-  if (isDebug) {
+  if (IS_DEBUG) {
    let debugCSS = await compileSassDebug(worker);
    await fs.writeFile("./resources/public/css/debug.css", debugCSS);
  }
--- a/frontend/scripts/build
+++ b/frontend/scripts/build
@@ -2,26 +2,26 @@
 # NOTE: this script should be called from the parent directory to
 # properly work.

+set -ex
+
 export INCLUDE_STORYBOOK=${BUILD_STORYBOOK:-no};
 export INCLUDE_WASM=${BUILD_WASM:-yes};
-export CURRENT_VERSION=$1;
-export BUILD_DATE=$(date -R);
-export CURRENT_HASH=${CURRENT_HASH:-$(git rev-parse --short HEAD)};
 export EXTRA_PARAMS=$SHADOWCLJS_EXTRA_PARAMS;
-export TS=$(date +%s);
+
+export BUILD_DATE=$(date -R);
+export BUILD_TS=$(date +%s);
+
+export VERSION=${1:-develop};
+export VERSION_TAG="${VERSION}-${BUILD_TS}";

 # Some cljs reacts on this environment variable for define more
 # performant code on macros (example: rumext)
 export NODE_ENV=production;

-echo "Current path:"
-echo $PATH
-
-set -ex

 corepack enable;
 corepack install;
-yarn install || exit 1;
+yarn install;

 rm -rf target/dist;
 rm -rf resources/public;
@@ -37,7 +37,7 @@ yarn run build:app:main $EXTRA_PARAMS;
 yarn run build:app:libs;
 yarn run build:app:assets;

-sed -i "s/\.\/render.js/.\/render.js?version=$CURRENT_VERSION/g" resources/public/js/worker/main*.js
+sed -i "s/\.\/render.js/.\/render.js?version=$VERSION_TAG/g" resources/public/js/worker/main*.js

 rsync -avr resources/public/ target/dist/

--- a/frontend/scripts/build-storybook
+++ b/frontend/scripts/build-storybook
@@ -2,18 +2,16 @@
 # NOTE: this script should be called from the parent directory to
 # properly work.

-export CURRENT_VERSION=$1;
+set -ex
+
+export BUILD_TS=$(date +%s);
 export BUILD_DATE=$(date -R);
-export CURRENT_HASH=${CURRENT_HASH:-$(git rev-parse --short HEAD)};
-export TS=$(date +%s);
+
+export VERSION=${1:-develop};
+export VERSION_TAG="${VERSION}-${BUILD_TS}";

 export NODE_ENV=production;

-echo "Current path:"
-echo $PATH
-
-set -ex
-
 corepack enable;
 corepack install || exit 1;
 yarn install || exit 1;
--- a/frontend/shadow-cljs.edn
+++ b/frontend/shadow-cljs.edn
@@ -75,6 +75,7 @@
    {:fn-invoke-direct true
     :optimizations #shadow/env ["PENPOT_BUILD_OPTIMIZATIONS" :as :keyword :default :advanced]
     :source-map true
+     :pseudo-names true
     :elide-asserts true
     :anon-fn-naming-policy :off
     :cross-chunk-method-motion false
--- a/frontend/src/app/config.cljs
+++ b/frontend/src/app/config.cljs
@@ -95,6 +95,7 @@
 (def browser              (parse-browser))
 (def platform             (parse-platform))

+(def version-tag          (obj/get global "penpotVersionTag"))
 (def terms-of-service-uri (obj/get global "penpotTermsOfServiceURI"))
 (def privacy-policy-uri   (obj/get global "penpotPrivacyPolicyURI"))
 (def flex-help-uri        (obj/get global "penpotGridHelpURI" "https://help.penpot.app/user-guide/flexible-layouts/"))
@@ -190,9 +191,8 @@

 (defn resolve-href
  [resource]
-  (let [version (get version :full)
-        href    (-> public-uri
-                    (u/ensure-path-slash)
-                    (u/join resource)
-                    (get :path))]
-    (str href "?version=" version)))
+  (let [href (-> public-uri
+                 (u/ensure-path-slash)
+                 (u/join resource)
+                 (get :path))]
+    (str href "?version=" version-tag)))
--- a/frontend/src/app/main/data/workspace/path/changes.cljs
+++ b/frontend/src/app/main/data/workspace/path/changes.cljs
@@ -17,12 +17,14 @@

 (defn generate-path-changes
  "Generates changes to update the new content of the shape"
-  [it objects page-id shape-id old-content new-content]
+  [it objects page-id shape old-content new-content]

  (assert (path/content? old-content))
  (assert (path/content? new-content))

-  (let [;; We set the old values so the update-shapes works
+  (let [shape-id (:id shape)
+
+        ;; We set the old values so the update-shapes works
        objects
        (update objects shape-id
                (fn [shape]
@@ -60,7 +62,6 @@
  ([]
   (save-path-content {}))
  ([{:keys [preserve-move-to] :or {preserve-move-to false}}]
-
   (ptk/reify ::save-path-content
     ptk/UpdateEvent
     (update [_ state]
--- a/frontend/src/app/main/data/workspace/path/edition.cljs
+++ b/frontend/src/app/main/data/workspace/path/edition.cljs
@@ -52,61 +52,26 @@

            content-modifiers
            (dm/get-in state [:workspace-local :edit-path id :content-modifiers])]
-
        (if (or (nil? shape) (nil? content-modifiers))
          (rx/of (dwe/clear-edition-mode))
-          (let [page-id      (get state :current-page-id)
-                objects      (dsh/lookup-page-objects state page-id)
+          (let [page-id      (get state :current-page-id state)
+                objects      (dsh/lookup-page-objects state)

-                old-content  (get shape :content)
-                new-content  (path/apply-content-modifiers old-content content-modifiers)
+                content      (get shape :content)
+                new-content  (path/apply-content-modifiers content content-modifiers)

-                old-points   (path.segment/get-points old-content)
+                old-points   (path.segment/get-points content)
                new-points   (path.segment/get-points new-content)
-                point-change (->> (map hash-map old-points new-points)
-                                  (reduce merge))]
+                point-change (->> (map hash-map old-points new-points) (reduce merge))]

            (when (and (some? new-content) (some? shape))
-              (let [changes (changes/generate-path-changes it objects page-id shape old-content new-content)]
+              (let [changes (changes/generate-path-changes it objects page-id shape (:content shape) new-content)]
                (if (empty? new-content)
                  (rx/of (dch/commit-changes changes)
                         (dwe/clear-edition-mode))
                  (rx/of (dch/commit-changes changes)
-                         (selection/update-selection id point-change)
-                         (fn [state]
-                           (update-in state [:workspace-local :edit-path id]
-                                      dissoc :content-modifiers :moving-nodes :moving-handler))))))))))))
-
-
-(defn apply-content-modifiers2
-  [shape-id old-content]
-  (ptk/reify ::apply-content-modifiers2
-    ptk/WatchEvent
-    (watch [it state _]
-      (let [ ;; FIXME: hide under getter function under state
-            content-modifiers
-            (dm/get-in state [:workspace-local :edit-path shape-id :content-modifiers])]
-
-        (if (nil? content-modifiers)
-          (rx/of (dwe/clear-edition-mode))
-          (let [page-id      (get state :current-page-id)
-                objects      (dsh/lookup-page-objects state page-id)
-                new-content  (path/apply-content-modifiers old-content content-modifiers)
-                point-change (->> (map hash-map
-                                       (path.segment/get-points old-content)
-                                       (path.segment/get-points new-content))
-                                  (reduce merge))
-                changes      (changes/generate-path-changes it objects page-id shape-id old-content new-content)]
-
-            (if (empty? new-content)
-              (rx/of (dch/commit-changes changes)
-                     (dwe/clear-edition-mode))
-              (rx/of (dch/commit-changes changes)
-                     (selection/update-selection shape-id point-change)
-                     (fn [state]
-                       (update-in state [:workspace-local :edit-path shape-id]
-                                  dissoc :content-modifiers :moving-nodes :moving-handler))))))))))
-
+                         (selection/update-selection point-change)
+                         (fn [state] (update-in state [:workspace-local :edit-path id] dissoc :content-modifiers :moving-nodes :moving-handler))))))))))))

 (defn modify-content-point
  [content {dx :x dy :y} modifiers point]
@@ -144,12 +109,12 @@
        (-> state
            (assoc-in [:workspace-local :edit-path id :content-modifiers] content-modifiers))))))

-(defn- move-selected-path-point [id from-point to-point]
+(defn move-selected-path-point [from-point to-point]
  (ptk/reify ::move-point
    ptk/UpdateEvent
    (update [_ state]
-      (let [shape    (st/get-path* state id)
-            content  (get shape :content)
+      (let [id (st/get-path-id state)
+            content (st/get-path state :content)
            to-point (cond-> to-point
                       (:shift? to-point) (path.helpers/position-fixed-angle from-point))

@@ -174,43 +139,39 @@
  (ptk/reify ::start-move-path-point
    ptk/WatchEvent
    (watch [_ state _]
-      (let [local     (get state :workspace-local)
-            id        (get local :edition)
-            points    (get-in local [:edit-path id :selected-points] #{})
-            selected? (contains? points position)]
-
-        (prn "start-move-path-point" id)
+      (let [id (dm/get-in state [:workspace-local :edition])
+            selected-points (dm/get-in state [:workspace-local :edit-path id :selected-points] #{})
+            selected? (contains? selected-points position)]
        (streams/drag-stream
         (rx/of
          (dwsh/update-shapes [id] path/convert-to-path)
          (when-not selected? (selection/select-node position shift?))
-          (drag-selected-points id @ms/mouse-position))
+          (drag-selected-points @ms/mouse-position))
         (rx/of (selection/select-node position shift?)))))))

-(defn- drag-selected-points
-  [id start-position]
+(defn drag-selected-points
+  [start-position]
  (ptk/reify ::drag-selected-points
    ptk/WatchEvent
    (watch [_ state stream]
      (let [stopper (mse/drag-stopper stream)

-            shape   (st/get-path* state id)
-            content (get shape :content)
-            points  (path.segment/get-points content)
+            id (dm/get-in state [:workspace-local :edition])

-            selected-points
-            (dm/get-in state [:workspace-local :edit-path id :selected-points] #{})
+            selected-points (dm/get-in state [:workspace-local :edit-path id :selected-points] #{})

-            start-position
-            (apply min-key #(gpt/distance start-position %) selected-points)]
+            start-position (apply min-key #(gpt/distance start-position %) selected-points)
+
+            content (st/get-path state :content)
+            points  (path.segment/get-points content)]

        (rx/concat
         ;; This stream checks the consecutive mouse positions to do the dragging
         (->> points
              (streams/move-points-stream start-position selected-points)
-              (rx/map #(move-selected-path-point id start-position %))
+              (rx/map #(move-selected-path-point start-position %))
              (rx/take-until stopper))
-         (rx/of (apply-content-modifiers2 id content)))))))
+         (rx/of (apply-content-modifiers)))))))

 (defn- get-displacement
  "Retrieve the correct displacement delta point for the
@@ -374,38 +335,28 @@
    (watch [_ _ _]
      (rx/of (ptk/data-event :layout/update {:ids [id]})))))

-
-(defn- snapshot-path-content
-  [id]
-  (ptk/reify ::snapshot-path-content
+(defn split-segments
+  [{:keys [from-p to-p t]}]
+  (ptk/reify ::split-segments
    ptk/UpdateEvent
    (update [_ state]
-      (let [shape   (st/get-path* state id)
-            content (get shape :content)]
-        (update-in state [:workspace-local :edit-path id] assoc :old-content content)))))
+      (let [id (st/get-path-id state)
+            content (st/get-path state :content)]
+        (-> state
+            (assoc-in [:workspace-local :edit-path id :old-content] content)
+            (st/set-content (-> content
+                                (path.segment/split-segments #{from-p to-p} t)
+                                (path/content))))))

-(defn- split-segments
-  [shape-id {:keys [from-p to-p t]}]
-  (ptk/reify ::split-segments
    ptk/WatchEvent
-    (watch [it state _]
-      (let [page-id      (get state :current-page-id)
-            objects      (dsh/lookup-page-objects state page-id)
-
-            shape        (st/get-path* state shape-id)
-            old-content  (get shape :content)
-            new-content  (-> old-content
-                             (path.segment/split-segments #{from-p to-p} t)
-                             (path/content))
-            changes     (changes/generate-path-changes it objects page-id shape-id old-content new-content)]
-
-        (rx/of (dch/commit-changes changes))))))
+    (watch [_ _ _]
+      (rx/of (changes/save-path-content {:preserve-move-to true})))))

 (defn create-node-at-position
-  [params]
+  [event]
  (ptk/reify ::create-node-at-position
    ptk/WatchEvent
    (watch [_ state _]
      (let [id (st/get-path-id state)]
        (rx/of (dwsh/update-shapes [id] path/convert-to-path)
-               (split-segments id params))))))
+               (split-segments event))))))
--- a/frontend/src/app/main/data/workspace/path/selection.cljs
+++ b/frontend/src/app/main/data/workspace/path/selection.cljs
@@ -149,11 +149,12 @@
           (rx/of (clear-area-selection))))))))

 (defn update-selection
-  [id point-change]
+  [point-change]
  (ptk/reify ::update-selection
    ptk/UpdateEvent
    (update [_ state]
-      (let [selected-points (dm/get-in state [:workspace-local :edit-path id :selected-points] #{})
+      (let [id (st/get-path-id state)
+            selected-points (dm/get-in state [:workspace-local :edit-path id :selected-points] #{})
            selected-points (into #{} (map point-change) selected-points)]
        (-> state
            (assoc-in [:workspace-local :edit-path id :selected-points] selected-points))))))
--- a/frontend/src/app/main/data/workspace/path/state.cljs
+++ b/frontend/src/app/main/data/workspace/path/state.cljs
@@ -34,15 +34,6 @@
      shape
      (get-in shape ks))))

-
-(defn get-path*
-  "Retrieves the location of the path object and additionally can pass
-  the arguments. This location can be used in get-in, assoc-in... functions"
-  [state id]
-  (let [page-id  (:current-page-id state)
-        file-id  (:current-file-id state)]
-    (get-in state [:files file-id :data :pages-index page-id :objects id])))
-
 (defn set-content
  [state content]
  (let [path-loc (get-path-location state :content)]
--- a/frontend/src/app/main/data/workspace/path/streams.cljs
+++ b/frontend/src/app/main/data/workspace/path/streams.cljs
@@ -82,7 +82,6 @@
 (defn move-points-stream
  [start-point selected-points points]

-  ;; FIXME: provide zoom on params and avoid derefing state
  (let [zoom (get-in @st/state [:workspace-local :zoom] 1)
        ranges (snap/create-ranges points selected-points)
        d-pos (/ snap/snap-path-accuracy zoom)
--- a/frontend/src/app/main/data/workspace/path/undo.cljs
+++ b/frontend/src/app/main/data/workspace/path/undo.cljs
@@ -72,8 +72,6 @@
    (watch [_ state _]
      (let [id (st/get-path-id state)
            undo-stack (get-in state [:workspace-local :edit-path id :undo-stack])]
-
-        (app.common.pprint/pprint undo-stack)
        (if (> (:index undo-stack) 0)
          (rx/of (changes/save-path-content {:preserve-move-to true}))
          (rx/of (changes/save-path-content {:preserve-move-to true})
--- a/frontend/src/app/main/ui/forms.cljs
+++ b/frontend/src/app/main/ui/forms.cljs
@@ -52,7 +52,8 @@
  (let [form      (mf/use-ctx context)
        disabled? (or (and (some? form)
                           (or (not (:valid @form))
-                               (seq (:external-errors @form))))
+                               (seq (:async-errors @form))
+                               (seq (:extra-errors @form))))
                      (true? disabled))
        handle-key-down-save
        (mf/use-fn
--- a/frontend/src/app/main/ui/workspace/tokens/management/forms/controls/input.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/management/forms/controls/input.cljs
@@ -332,6 +332,7 @@
                                 message (tr "workspace.tokens.resolved-value" (or resolved-value value))]
                             (swap! form update :errors dissoc :value)
                             (swap! form update :extra-errors dissoc :value)
+                             (swap! form update :async-errors dissoc :reference)
                             (if (= input-value (str resolved-value))
                               (reset! hint* {})
                               (reset! hint* {:message message :type "hint"})))))))]
--- a/frontend/src/app/main/ui/workspace/tokens/management/forms/generic_form.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/management/forms/generic_form.cljs
@@ -101,13 +101,6 @@
        active-tab* (mf/use-state #(if (cft/is-reference? token) :reference :composite))
        active-tab (deref active-tab*)

-        on-toggle-tab
-        (mf/use-fn
-         (mf/deps)
-         (fn [new-tab]
-           (let [new-tab (keyword new-tab)]
-             (reset! active-tab* new-tab))))
-
        token
        (mf/with-memo [token]
          (or token {:type token-type}))
@@ -144,6 +137,17 @@
        (fm/use-form :schema schema
                     :initial initial)

+        on-toggle-tab
+        (mf/use-fn
+         (mf/deps form)
+         (fn [new-tab]
+           (let [new-tab (keyword new-tab)]
+             (if (= new-tab :reference)
+               (swap! form assoc-in [:async-errors :reference]
+                      {:message "Need valid reference"})
+               (swap! form update :async-errors dissoc :reference))
+             (reset! active-tab* new-tab))))
+
        warning-name-change?
        (not= (get-in @form [:data :name])
              (:name initial))
--- a/frontend/src/app/plugins/shape.cljs
+++ b/frontend/src/app/plugins/shape.cljs
@@ -1185,7 +1185,6 @@
                       {:cmd :export-shapes
                        :profile-id (:profile-id @st/state)
                        :wait true
-                        :skip-children (:skip-children value false)
                        :exports [{:file-id   file-id
                                   :page-id   page-id
                                   :object-id id
--- a/frontend/src/app/util/i18n.cljs
+++ b/frontend/src/app/util/i18n.cljs
@@ -114,7 +114,7 @@

 (defn- load
  [locale]
-  (let [path (str "./translation." locale ".js?version=" (:full cf/version))]
+  (let [path (str "./translation." locale ".js?version=" cf/version-tag)]
    (->> (mod/import path)
         (p/fmap (fn [result] (unchecked-get result "default")))
         (p/fnly (fn [data cause]
--- a/render-wasm/_build_env
+++ b/render-wasm/_build_env
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash

-export CURRENT_VERSION=${CURRENT_VERSION:-develop};
+export VERSION_TAG=${VERSION:-develop};

 if [ "$NODE_ENV" = "production" ];  then
    export BUILD_MODE="release";
@@ -81,7 +81,7 @@ function copy_artifacts {
    cp target/wasm32-unknown-emscripten/$BUILD_MODE/render_wasm.js $DEST/$BUILD_NAME.js;
    cp target/wasm32-unknown-emscripten/$BUILD_MODE/render_wasm.wasm $DEST/$BUILD_NAME.wasm;

-    sed -i "s/render_wasm.wasm/$BUILD_NAME.wasm?version=$CURRENT_VERSION/g" $DEST/$BUILD_NAME.js;
+    sed -i "s/render_wasm.wasm/$BUILD_NAME.wasm?version=$VERSION_TAG/g" $DEST/$BUILD_NAME.js;

    yarn esbuild target/wasm32-unknown-emscripten/$BUILD_MODE/render_wasm.js \
        --log-level=error \
Author	SHA1	Message	Date
Andrey Antukh	6393330ee1	Merge remote-tracking branch 'origin/staging'	2026-01-20 16:25:10 +01:00
Andrey Antukh	8252bc485e	📚 Fix oidc callback related documentation issue	2026-01-20 16:24:12 +01:00
Alonso Torres	47775a9e2c	Merge pull request #8134 from penpot/alotor-fix-plugins-export 🐛 Fix problem with export in plugins	2026-01-20 15:03:04 +01:00
Andrey Antukh	8191d04114	✨ Use non-legacy config example on docker compose file	2026-01-20 13:25:55 +01:00
Andrey Antukh	88f0f75174	Merge pull request #8129 from penpot/niwinz-staging-bugfix-1 ✨ Several improvements for build process	2026-01-20 12:26:55 +01:00
Andrey Antukh	1ffa956251	✨ Include timestamp on version tag	2026-01-20 12:26:39 +01:00
Andrey Antukh	31054099ff	✨ Use pseudo-names on release builds of frontend (#8105 )	2026-01-20 12:26:39 +01:00
Eva Marco	983487d73c	🐛 Fix shadow token reference validation (#8128 )	2026-01-20 10:56:27 +01:00
Andrey Antukh	5c71c57dd9	Merge tag '2.12.1'	2025-12-30 15:37:30 +01:00
Andrey Antukh	5abc1aafb4	Merge tag '2.12.0-RC3'	2025-12-12 12:19:29 +01:00
Andrey Antukh	935728aa39	🔧 Backport build-tag github workflow from develop	2025-12-05 10:26:01 +01:00