Merge remote-tracking branch 'origin/staging' into develop

This was intended to be changed on 13fcf3a9bb. However only the menu
order changed, not the default option.

Signed-off-by: Dalai Felinto <dalai@blender.org>
Co-authored-by: Dalai Felinto <dalai@blender.org>

.github/workflows/tests.yml

@@ -216,7 +216,7 @@ jobs:
 
 
   test-integration-1:
-    name: "Integration Tests 1/6"
+    name: "Integration Tests 1/4"
     runs-on: penpot-runner-02
     container: penpotapp/devenv:latest
     needs: build-integration
@@ -234,7 +234,7 @@ jobs:
       - name: Run Tests
         working-directory: ./frontend
         run: |
-          ./scripts/test-e2e --shard="1/6";
+          ./scripts/test-e2e --shard="1/4";
 
       - name: Upload test result
         uses: actions/upload-artifact@v4
@@ -246,7 +246,7 @@ jobs:
           retention-days: 3
 
   test-integration-2:
-    name: "Integration Tests 2/6"
+    name: "Integration Tests 2/4"
     runs-on: penpot-runner-02
     container: penpotapp/devenv:latest
     needs: build-integration
@@ -264,7 +264,7 @@ jobs:
       - name: Run Tests
         working-directory: ./frontend
         run: |
-          ./scripts/test-e2e --shard="2/6";
+          ./scripts/test-e2e --shard="2/4";
 
       - name: Upload test result
         uses: actions/upload-artifact@v4
@@ -276,7 +276,7 @@ jobs:
           retention-days: 3
 
   test-integration-3:
-    name: "Integration Tests 3/6"
+    name: "Integration Tests 3/4"
     runs-on: penpot-runner-02
     container: penpotapp/devenv:latest
     needs: build-integration
@@ -294,7 +294,7 @@ jobs:
       - name: Run Tests
         working-directory: ./frontend
         run: |
-          ./scripts/test-e2e --shard="3/6";
+          ./scripts/test-e2e --shard="3/4";
 
       - name: Upload test result
         uses: actions/upload-artifact@v4
@@ -306,7 +306,7 @@ jobs:
           retention-days: 3
 
   test-integration-4:
-    name: "Integration Tests 4/6"
+    name: "Integration Tests 4/4"
     runs-on: penpot-runner-02
     container: penpotapp/devenv:latest
     needs: build-integration
@@ -324,7 +324,7 @@ jobs:
       - name: Run Tests
         working-directory: ./frontend
         run: |
-          ./scripts/test-e2e --shard="4/6";
+          ./scripts/test-e2e --shard="4/4";
 
       - name: Upload test result
         uses: actions/upload-artifact@v4
@@ -334,63 +334,3 @@ jobs:
           path: frontend/test-results/
           overwrite: true
           retention-days: 3
-
-  test-integration-5:
-    name: "Integration Tests 5/6"
-    runs-on: penpot-runner-02
-    container: penpotapp/devenv:latest
-    needs: build-integration
-
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-
-      - name: Restore Cache
-        uses: actions/cache/restore@v4
-        with:
-          key: "integration-bundle-${{ github.sha }}"
-          path: frontend/resources/public
-
-      - name: Run Tests
-        working-directory: ./frontend
-        run: |
-          ./scripts/test-e2e --shard="5/6";
-
-      - name: Upload test result
-        uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: integration-tests-result-5
-          path: frontend/test-results/
-          overwrite: true
-          retention-days: 3
-
-  test-integration-6:
-    name: "Integration Tests 6/6"
-    runs-on: penpot-runner-02
-    container: penpotapp/devenv:latest
-    needs: build-integration
-
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-
-      - name: Restore Cache
-        uses: actions/cache/restore@v4
-        with:
-          key: "integration-bundle-${{ github.sha }}"
-          path: frontend/resources/public
-
-      - name: Run Tests
-        working-directory: ./frontend
-        run: |
-          ./scripts/test-e2e --shard="6/6";
-
-      - name: Upload test result
-        uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: integration-tests-result-6
-          path: frontend/test-results/
-          overwrite: true
-          retention-days: 3

docker/devenv/files/nginx.conf

@@ -223,7 +223,7 @@ http {
                 add_header X-Cache-Status $upstream_cache_status;
             }
 
-            location ~* \.(jpg|png|svg|ttf|woff|woff2)$ {
+            location ~* \.(jpg|png|svg|ttf|woff|woff2|gif)$ {
                 add_header Cache-Control "public, max-age=604800" always; # 7 days
             }
 

docker/images/files/nginx.conf.template

@@ -144,7 +144,7 @@ http {
         location / {
             include /etc/nginx/overrides/location.d/*.conf;
 
-            location ~* \.(js|css|wasm|jpg|png|map|svg|ttf|woff|woff2|)$ {
+            location ~* \.(js|css|jpg|png|svg|gif|ttf|woff|woff2|wasm|map)$ {
                 add_header Cache-Control "public, max-age=604800" always; # 7 days
             }
 

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