github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-04-25 11:18:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andrey Antukh 2026-04-22 09:58:20 +02:00
commit 448b5d4786
8 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
exporter/src/app/renderer/bitmap.cljs
View File

@ -60,6 +60,7 @@
:route "objects"
:skip-children skip-children}
uri (-> (cf/get :public-uri)
(assoc :path "/render.html")
(u/ensure-path-slash)
(u/join "render.html")
(assoc :query (u/map->query-string params)))]
(bw/exec! (prepare-options uri) (partial render uri)))))

5
exporter/src/app/renderer/pdf.cljs
View File

@ -35,7 +35,7 @@
:object-id object-id
:route "objects"}]
(-> base-uri
(assoc :path "/render.html")
(u/join "render.html")
(assoc :query (u/map->query-string params)))))
(sync-page-size! [dom]
@ -76,6 +76,7 @@
(on-object (assoc object :path path))
(p/recur (rest objects))))))]
(let [base-uri (cf/get :public-uri)]
(let [base-uri (-> (cf/get :public-uri)
(u/ensure-path-slash))]
(bw/exec! (prepare-options base-uri)
(partial render base-uri)))))

3
exporter/src/app/renderer/svg.cljs
View File

@ -349,7 +349,8 @@
:object-id (mapv :id objects)
:route "objects"}
uri (-> (cf/get :public-uri)
(assoc :path "/render.html")
(u/ensure-path-slash)
(u/join "render.html")
(assoc :query (u/map->query-string params)))]
(bw/exec! (prepare-options uri)
(partial render uri)))))

1
frontend/resources/templates/index.mustache
View File

@ -31,7 +31,6 @@
globalThis.penpotVersion = "{{& version}}";
globalThis.penpotVersionTag = "{{& version_tag}}";
globalThis.penpotBuildDate = "{{& build_date}}";
globalThis.penpotWorkerURI = "{{& manifest.worker_main}}";
</script>
{{# manifest}}

1
frontend/resources/templates/rasterizer.mustache
View File

@ -9,7 +9,6 @@
globalThis.penpotVersion = "{{& version}}";
globalThis.penpotVersionTag = "{{& version_tag}}";
globalThis.penpotBuildDate = "{{& build_date}}";
globalThis.penpotWorkerURI = "{{& manifest.worker_main}}";
</script>
{{# manifest}}

1
frontend/scripts/_helpers.js
View File

@ -209,7 +209,6 @@ async function generateManifest() {
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({

9
frontend/src/app/config.cljs
View File

@ -156,9 +156,9 @@
(def privacy-policy-uri (obj/get global "penpotPrivacyPolicyURI"))
(def flex-help-uri (obj/get global "penpotGridHelpURI" "https://help.penpot.app/user-guide/flexible-layouts/"))
(def grid-help-uri (obj/get global "penpotGridHelpURI" "https://help.penpot.app/user-guide/flexible-layouts/"))
(def plugins-list-uri (obj/get global "penpotPluginsListUri" "https://penpot.app/penpothub/plugins"))
(def plugins-list-uri (obj/get global "penpotPluginsListURI" "https://penpot.app/penpothub/plugins"))
(def plugins-whitelist (into #{} (obj/get global "penpotPluginsWhitelist" [])))
(def templates-uri (obj/get global "penpotTemplatesUri" "https://penpot.github.io/penpot-files/"))
(def templates-uri (obj/get global "penpotTemplatesURI" "https://penpot.github.io/penpot-files/"))
(def upload-chunk-size (obj/get global "penpotUploadChunkSize" (* 1024 1024 25))) ;; 25 MiB
;; We set the current parsed flags under common for make
@ -185,7 +185,10 @@
public-uri))
(def worker-uri
(obj/get global "penpotWorkerURI" "/js/worker/main.js"))
(-> public-uri
(u/join "js/worker/main.js")
(get :path)
(str "?version=" version-tag)))
(defn external-feature-flag
[flag value]

4
frontend/src/app/util/worker.cljs
View File

@ -90,8 +90,8 @@
"Return a initialized webworker instance."
[path on-error]
(let [instance (js/Worker. path)
bus (rx/subject)
worker (Worker. instance (rx/to-observable bus))
bus (rx/subject)
worker (Worker. instance (rx/to-observable bus))
handle-message
(fn [event]