diff --git a/frontend/shadow-cljs.edn b/frontend/shadow-cljs.edn index dab57241a8..f80bdc098a 100644 --- a/frontend/shadow-cljs.edn +++ b/frontend/shadow-cljs.edn @@ -83,7 +83,7 @@ :source-map-detail-level :all}}} :worker - {:target :esm + {:target :browser :output-dir "resources/public/js/worker/" :asset-path "/js/worker" :devtools {:browser-inject :main diff --git a/frontend/src/app/main/ui/dashboard/grid.cljs b/frontend/src/app/main/ui/dashboard/grid.cljs index 695e9fb44e..d60d0a9483 100644 --- a/frontend/src/app/main/ui/dashboard/grid.cljs +++ b/frontend/src/app/main/ui/dashboard/grid.cljs @@ -18,7 +18,6 @@ [app.main.data.notifications :as ntf] [app.main.data.project :as dpj] [app.main.data.team :as dtm] - [app.main.features :as features] [app.main.fonts :as fonts] [app.main.rasterizer :as thr] [app.main.refs :as refs] @@ -59,22 +58,17 @@ (defn render-thumbnail [file-id revn] - (if (features/active-feature? @st/state "render-wasm/v1") - (->> (mw/ask! {:cmd :thumbnails/generate-for-file-wasm - :revn revn - :file-id file-id - :width thumbnail-width})) - (->> (mw/ask! {:cmd :thumbnails/generate-for-file - :revn revn - :file-id file-id - :width thumbnail-width}) - (rx/mapcat - (fn [{:keys [fonts] :as result}] - (->> (fonts/render-font-styles fonts) - (rx/map (fn [styles] - (-> result - (assoc :styles styles - :width thumbnail-width)))))))))) + (->> (mw/ask! {:cmd :thumbnails/generate-for-file + :revn revn + :file-id file-id + :width thumbnail-width}) + (rx/mapcat + (fn [{:keys [fonts] :as result}] + (->> (fonts/render-font-styles fonts) + (rx/map (fn [styles] + (-> result + (assoc :styles styles + :width thumbnail-width))))))))) (defn- ask-for-thumbnail "Creates some hooks to handle the files thumbnails cache" diff --git a/frontend/src/app/util/worker.cljs b/frontend/src/app/util/worker.cljs index cf3260ad30..bf1b44c30b 100644 --- a/frontend/src/app/util/worker.cljs +++ b/frontend/src/app/util/worker.cljs @@ -89,7 +89,7 @@ (defn init "Return a initialized webworker instance." [path on-error] - (let [instance (js/Worker. path #js {:type "module"}) + (let [instance (js/Worker. path) bus (rx/subject) worker (Worker. instance (rx/to-observable bus))