mirror of
https://github.com/penpot/penpot.git
synced 2026-09-14 16:09:01 +00:00
Merge remote-tracking branch 'origin/staging' into develop
This commit is contained in:
commit
0374e4f3eb
9
.github/workflows/build-bundles.yml
vendored
9
.github/workflows/build-bundles.yml
vendored
@ -15,6 +15,7 @@ on:
|
|||||||
# zip_mode defines how the build artifacts are packaged:
|
# zip_mode defines how the build artifacts are packaged:
|
||||||
# - 'individual': creates one ZIP file per component (frontend, backend, exporter)
|
# - 'individual': creates one ZIP file per component (frontend, backend, exporter)
|
||||||
# - 'all': creates a single ZIP containing all components
|
# - 'all': creates a single ZIP containing all components
|
||||||
|
# - null: for the rest of cases (non-manual events)
|
||||||
description: 'Bundle packaging mode'
|
description: 'Bundle packaging mode'
|
||||||
required: false
|
required: false
|
||||||
default: 'individual'
|
default: 'individual'
|
||||||
@ -62,8 +63,8 @@ jobs:
|
|||||||
echo "📦 Packaging Penpot 'all' bundles..."
|
echo "📦 Packaging Penpot 'all' bundles..."
|
||||||
zip -r zips/penpot-all-bundles.zip penpot
|
zip -r zips/penpot-all-bundles.zip penpot
|
||||||
|
|
||||||
- name: Create zip bundles for zip_mode == 'individual'
|
- name: Create zip bundles for zip_mode != 'all'
|
||||||
if: ${{ github.event.inputs.zip_mode == 'individual' }}
|
if: ${{ github.event.inputs.zip_mode != 'all' }}
|
||||||
run: |
|
run: |
|
||||||
echo "📦 Packaging Penpot 'individual' bundles..."
|
echo "📦 Packaging Penpot 'individual' bundles..."
|
||||||
zip -r zips/penpot-frontend.zip penpot/frontend
|
zip -r zips/penpot-frontend.zip penpot/frontend
|
||||||
@ -78,7 +79,7 @@ jobs:
|
|||||||
path: zips/penpot-all-bundles.zip
|
path: zips/penpot-all-bundles.zip
|
||||||
|
|
||||||
- name: Upload individual bundles
|
- name: Upload individual bundles
|
||||||
if: ${{ github.event.inputs.zip_mode == 'individual' }}
|
if: ${{ github.event.inputs.zip_mode != 'all' }}
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: penpot-individual-bundles
|
name: penpot-individual-bundles
|
||||||
@ -94,7 +95,7 @@ jobs:
|
|||||||
aws s3 cp zips/penpot-all-bundles.zip s3://${{ secrets.S3_BUCKET }}/penpot-all-bundles-${{ steps.vars.outputs.commit_hash }}.zip
|
aws s3 cp zips/penpot-all-bundles.zip s3://${{ secrets.S3_BUCKET }}/penpot-all-bundles-${{ steps.vars.outputs.commit_hash }}.zip
|
||||||
|
|
||||||
- name: Upload 'individual' bundles to S3
|
- name: Upload 'individual' bundles to S3
|
||||||
if: ${{ github.event.inputs.zip_mode == 'individual' }}
|
if: ${{ github.event.inputs.zip_mode != 'all' }}
|
||||||
run: |
|
run: |
|
||||||
for name in penpot-frontend penpot-backend penpot-exporter; do
|
for name in penpot-frontend penpot-backend penpot-exporter; do
|
||||||
aws s3 cp zips/${name}.zip s3://${{ secrets.S3_BUCKET }}/${name}-${{ steps.vars.outputs.gh_branch }}-latest.zip
|
aws s3 cp zips/${name}.zip s3://${{ secrets.S3_BUCKET }}/${name}-${{ steps.vars.outputs.gh_branch }}-latest.zip
|
||||||
|
|||||||
@ -59,6 +59,7 @@ on-premises instances** that want to keep up to date.
|
|||||||
- Update google fonts (at 2025/05/19) [Taiga 10792](https://tree.taiga.io/project/penpot/us/10792)
|
- Update google fonts (at 2025/05/19) [Taiga 10792](https://tree.taiga.io/project/penpot/us/10792)
|
||||||
- Add tooltip component to DS [Taiga 9220](https://tree.taiga.io/project/penpot/us/9220)
|
- Add tooltip component to DS [Taiga 9220](https://tree.taiga.io/project/penpot/us/9220)
|
||||||
- Allow multi file token export [Taiga #10144](https://tree.taiga.io/project/penpot/us/10144)
|
- Allow multi file token export [Taiga #10144](https://tree.taiga.io/project/penpot/us/10144)
|
||||||
|
- Fix problem when double click on hidden shapes [Taiga #11314](https://tree.taiga.io/project/penpot/issue/11314)
|
||||||
|
|
||||||
### :bug: Bugs fixed
|
### :bug: Bugs fixed
|
||||||
|
|
||||||
|
|||||||
@ -200,7 +200,17 @@
|
|||||||
contents
|
contents
|
||||||
(sequence extract-content-xf (:shapes shape))]
|
(sequence extract-content-xf (:shapes shape))]
|
||||||
|
|
||||||
(bool/calculate-content (:bool-type shape) contents)))
|
(ex/try!
|
||||||
|
(bool/calculate-content (:bool-type shape) contents)
|
||||||
|
|
||||||
|
:on-exception
|
||||||
|
(fn [cause]
|
||||||
|
(ex/raise :type :internal
|
||||||
|
:code :invalid-path-content
|
||||||
|
:hint (str "unable to calculate bool content for shape " (:id shape))
|
||||||
|
:shapes (:shapes shape)
|
||||||
|
:content (mapv str contents)
|
||||||
|
:cause cause)))))
|
||||||
|
|
||||||
(defn calc-bool-content
|
(defn calc-bool-content
|
||||||
"Calculate the boolean content from shape and objects. Returns a
|
"Calculate the boolean content from shape and objects. Returns a
|
||||||
|
|||||||
@ -286,7 +286,8 @@
|
|||||||
(fn [mod? ids]
|
(fn [mod? ids]
|
||||||
(let [sorted-ids
|
(let [sorted-ids
|
||||||
(into (d/ordered-set)
|
(into (d/ordered-set)
|
||||||
(comp (remove #(dm/get-in objects [% :blocked]))
|
(comp (remove (partial cfh/hidden-parent? objects))
|
||||||
|
(remove #(dm/get-in objects [% :blocked]))
|
||||||
(remove (partial cfh/svg-raw-shape? objects)))
|
(remove (partial cfh/svg-raw-shape? objects)))
|
||||||
(ctt/sort-z-index objects ids {:bottom-frames? mod?}))]
|
(ctt/sort-z-index objects ids {:bottom-frames? mod?}))]
|
||||||
(mf/set-ref-val! sorted-ids-cache (assoc cached-ids [mod? ids] sorted-ids))
|
(mf/set-ref-val! sorted-ids-cache (assoc cached-ids [mod? ids] sorted-ids))
|
||||||
@ -355,7 +356,6 @@
|
|||||||
hover-shape
|
hover-shape
|
||||||
(->> ids
|
(->> ids
|
||||||
(remove remove-hover?)
|
(remove remove-hover?)
|
||||||
(remove (partial cfh/hidden-parent? objects))
|
|
||||||
(remove #(and mod? (no-fill-nested-frames? %)))
|
(remove #(and mod? (no-fill-nested-frames? %)))
|
||||||
(filter #(or (empty? focus) (cpf/is-in-focus? objects focus %)))
|
(filter #(or (empty? focus) (cpf/is-in-focus? objects focus %)))
|
||||||
(first)
|
(first)
|
||||||
@ -366,7 +366,6 @@
|
|||||||
(when show-measures?
|
(when show-measures?
|
||||||
(->> ids
|
(->> ids
|
||||||
(remove remove-measure?)
|
(remove remove-measure?)
|
||||||
(remove (partial cfh/hidden-parent? objects))
|
|
||||||
(remove #(and mod? (no-fill-nested-frames? %)))
|
(remove #(and mod? (no-fill-nested-frames? %)))
|
||||||
(filter #(or (empty? focus) (cpf/is-in-focus? objects focus %)))
|
(filter #(or (empty? focus) (cpf/is-in-focus? objects focus %)))
|
||||||
(first)
|
(first)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user