johanels/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-12-12 06:24:17 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

♻️ Use ESM target for build frontend

Browse Source
This commit is contained in:
Andrey Antukh
2025-11-20 19:18:15 +01:00
parent 5080fcc594
commit 2f1b99fa53
27 changed files with 165 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.github/workflows/tests.yml vendored
View File

@@ -159,17 +159,7 @@ jobs:
- name: Build Bundle - name: Build Bundle
working-directory: ./frontend working-directory: ./frontend
run: | run: |
corepack enable; ./scripts/build 0.0.0
corepack install;
yarn install
yarn run build:app:assets
yarn run build:app
yarn run build:app:libs
- name: Build WASM
working-directory: "./render-wasm"
run: |
./build release
- name: Store Bundle Cache - name: Store Bundle Cache
uses: actions/cache@v4 uses: actions/cache@v4
@@ -177,6 +167,7 @@ jobs:
key: "integration-bundle-${{ github.sha }}" key: "integration-bundle-${{ github.sha }}"
path: frontend/resources/public path: frontend/resources/public
test-integration-1: test-integration-1:
name: "Integration Tests 1/4" name: "Integration Tests 1/4"
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04

6
frontend/deps.edn
View File

@@ -20,8 +20,8 @@
:git/url "https://github.com/funcool/beicon.git"} :git/url "https://github.com/funcool/beicon.git"}
funcool/rumext funcool/rumext
{:git/tag "v2.24" {:git/tag "v2.25"
:git/sha "17a0c94" :git/sha "27e5a1a"
:git/url "https://github.com/funcool/rumext.git"} :git/url "https://github.com/funcool/rumext.git"}
instaparse/instaparse {:mvn/version "1.5.0"} instaparse/instaparse {:mvn/version "1.5.0"}
@@ -42,7 +42,7 @@
:dev :dev
{:extra-paths ["dev"] {:extra-paths ["dev"]
:extra-deps :extra-deps
{thheller/shadow-cljs {:mvn/version "3.2.0"} {thheller/shadow-cljs {:mvn/version "3.2.2"}
com.bhauman/rebel-readline {:mvn/version "RELEASE"} com.bhauman/rebel-readline {:mvn/version "RELEASE"}
org.clojure/tools.namespace {:mvn/version "RELEASE"} org.clojure/tools.namespace {:mvn/version "RELEASE"}
criterium/criterium {:mvn/version "RELEASE"} criterium/criterium {:mvn/version "RELEASE"}

4
frontend/package.json
View File

@@ -45,9 +45,9 @@
"translations": "node ./scripts/translations.js", "translations": "node ./scripts/translations.js",
"watch:app:assets": "node ./scripts/watch.js", "watch:app:assets": "node ./scripts/watch.js",
"watch:app:libs": "node ./scripts/build-libs.js --watch", "watch:app:libs": "node ./scripts/build-libs.js --watch",
"watch:app:main": "clojure -M:dev:shadow-cljs watch main storybook", "watch:app:main": "clojure -M:dev:shadow-cljs watch main worker storybook",
"clear:shadow-cache": "rm -rf .shadow-cljs", "clear:shadow-cache": "rm -rf .shadow-cljs",
"watch:app": "yarn run clear:shadow-cache && yarn run build:app:worker && concurrently \"yarn run watch:app:main\" \"yarn run watch:app:libs\"", "watch:app": "yarn run clear:shadow-cache && concurrently \"yarn run watch:app:main\" \"yarn run watch:app:libs\"",
"watch": "yarn run watch:app:assets", "watch": "yarn run watch:app:assets",
"watch:storybook": "yarn run build:storybook:assets && concurrently \"storybook dev -p 6006 --no-open\" \"yarn run watch:storybook:assets\"", "watch:storybook": "yarn run build:storybook:assets && concurrently \"storybook dev -p 6006 --no-open\" \"yarn run watch:storybook:assets\"",
"watch:storybook:assets": "node ./scripts/watch-storybook.js" "watch:storybook:assets": "node ./scripts/watch-storybook.js"

2
frontend/playwright/ui/pages/BasePage.js
View File

@@ -73,7 +73,7 @@ export class BasePage {
} }
static async mockConfigFlags(page, flags) { static async mockConfigFlags(page, flags) {
const url = "**/js/config.js?ts=*"; const url = "**/js/config.js";
return await page.route(url, (route) => return await page.route(url, (route) =>
route.fulfill({ route.fulfill({
status: 200, status: 200,

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

@@ -25,14 +25,14 @@
<link rel="icon" href="images/favicon.png" /> <link rel="icon" href="images/favicon.png" />
{{# manifest}} {{# manifest}}
<script>window.penpotWorkerURI="{{& worker_main}}"</script> <script>window.penpotWorkerURI="{{& worker_main}}"</script>
<script defer src="{{& config}}"></script> <script src="{{& config}}"></script>
<script defer src="{{& polyfills}}"></script> <script src="{{& polyfills}}"></script>
{{/manifest}} {{/manifest}}
<script> <script type="module">
window.penpotTranslations = JSON.parse({{& translations}}); globalThis.penpotTranslations = JSON.parse({{& translations}});
window.penpotVersion = "%version%"; globalThis.penpotVersion = "%version%";
window.penpotBuildDate = "%buildDate%"; globalThis.penpotBuildDate = "%buildDate%";
</script> </script>
<!--cookie-consent--> <!--cookie-consent-->
</head> </head>
@@ -44,9 +44,11 @@
<section id="modal"></section> <section id="modal"></section>
{{# manifest}} {{# manifest}}
<script defer src="js/libs.js?ts={{& ts}}"></script> <script type="module" src="{{& libs}}"></script>
<script defer src="{{& shared}}"></script> <script type="module">
<script defer src="{{& main}}"></script> import { init } from "{{& main}}";
init();
</script>
{{/manifest}} {{/manifest}}
</body> </body>
</html> </html>

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

@@ -19,9 +19,11 @@
</head> </head>
<body> <body>
{{# manifest}} {{# manifest}}
<script src="js/libs.js?ts={{& ts}}"></script> <script type="module" src="{{& libs}}"></script>
<script src="{{& shared}}"></script> <script type="module">
<script src="{{& rasterizer}}"></script> import { init } from "{{& rasterizer}}";
init();
</script>
{{/manifest}} {{/manifest}}
</body> </body>
</html> </html>

8
frontend/resources/templates/render.mustache
View File

@@ -18,9 +18,11 @@
<body> <body>
<div id="app"></div> <div id="app"></div>
{{# manifest}} {{# manifest}}
<script src="js/libs.js?ts={{& ts}}"></script> <script type="module" src="{{& libs}}"></script>
<script src="{{& shared}}"></script> <script type="module">
<script src="{{& render}}"></script> import { init } from "{{& render}}";
init();
</script>
{{/manifest}} {{/manifest}}
</body> </body>
</html> </html>

26
frontend/scripts/_helpers.js
View File

@@ -193,26 +193,30 @@ async function readShadowManifest() {
const index = { const index = {
ts: ts, ts: ts,
config: "js/config.js?ts=" + ts, config: "./js/config.js",
polyfills: "js/polyfills.js?ts=" + ts, polyfills: "./js/polyfills.js",
worker_main: "js/worker/main.js?ts=" + ts, worker_main: "./js/worker/main.js",
libs: "./js/libs.js",
}; };
for (let item of content) { for (let item of content) {
index[item.name] = "js/" + item["output-name"]; index[item.name] = "./js/" + item["output-name"] + "";
} }
return index; return index;
} catch (cause) { } catch (cause) {
return { const index = {
ts: ts, ts: ts,
config: "js/config.js?ts=" + ts, config: "./js/config.js",
polyfills: "js/polyfills.js?ts=" + ts, polyfills: "./js/polyfills.js",
main: "js/main.js?ts=" + ts, main: "./js/main.js",
shared: "js/shared.js?ts=" + ts, shared: "./js/shared.js",
worker_main: "js/worker/main.js?ts=" + ts, worker_main: "./js/worker/main.js",
rasterizer: "js/rasterizer.js?ts=" + ts, rasterizer: "./js/rasterizer.js",
libs: "./js/libs.js",
}; };
return index;
} }
} }

22
frontend/scripts/build
View File

@@ -26,7 +26,10 @@ yarn install || exit 1;
rm -rf resources/public; rm -rf resources/public;
rm -rf target/dist; rm -rf target/dist;
yarn run build:app:main --config-merge "{:release-version \"${CURRENT_HASH}-${TS}\"}" $EXTRA_PARAMS || exit 1 mkdir -p resources/public;
mkdir -p target/dist;
yarn run build:app:main $EXTRA_PARAMS || exit 1
if [ "$INCLUDE_WASM" = "yes" ]; then if [ "$INCLUDE_WASM" = "yes" ]; then
yarn run build:wasm || exit 1; yarn run build:wasm || exit 1;
@@ -35,19 +38,18 @@ fi
yarn run build:app:libs || exit 1; yarn run build:app:libs || exit 1;
yarn run build:app:assets || exit 1; yarn run build:app:assets || exit 1;
mkdir -p target/dist; sed -i -re "s/\%version\%/$CURRENT_VERSION/g" ./resources/public/index.html;
rsync -avr resources/public/ target/dist/ sed -i -re "s/\%version\%/$CURRENT_VERSION/g" ./resources/public/render.html;
sed -i -re "s/\%version\%/$CURRENT_VERSION/g" ./resources/public/rasterizer.html;
sed -i -re "s/\%version\%/$CURRENT_VERSION/g" ./target/dist/index.html; sed -i -re "s/\%buildDate\%/$BUILD_DATE/g" ./resources/public/index.html;
sed -i -re "s/\%version\%/$CURRENT_VERSION/g" ./target/dist/render.html; sed -i -re "s/\%buildDate\%/$BUILD_DATE/g" ./resources/public/rasterizer.html;
sed -i -re "s/\%version\%/$CURRENT_VERSION/g" ./target/dist/rasterizer.html;
sed -i -re "s/\%buildDate\%/$BUILD_DATE/g" ./target/dist/index.html;
sed -i -re "s/\%buildDate\%/$BUILD_DATE/g" ./target/dist/rasterizer.html;
if [ "$INCLUDE_WASM" = "yes" ]; then if [ "$INCLUDE_WASM" = "yes" ]; then
sed -i "s/version=develop/version=$CURRENT_VERSION/g" ./target/dist/js/render_wasm.js; sed -i "s/version=develop/version=$CURRENT_VERSION/g" ./resources/public/js/render_wasm.js;
fi fi
rsync -avr resources/public/ target/dist/;
if [ "$INCLUDE_STORYBOOK" = "yes" ]; then if [ "$INCLUDE_STORYBOOK" = "yes" ]; then
# build storybook # build storybook
yarn run build:storybook || exit 1; yarn run build:storybook || exit 1;

4
frontend/scripts/build-libs.js
View File

@@ -31,9 +31,9 @@ const rebuildNotify = {
const config = { const config = {
entryPoints: ["target/index.js"], entryPoints: ["target/index.js"],
bundle: true, bundle: true,
format: "iife", format: "esm",
banner: { banner: {
js: '"use strict"; var global = globalThis;', js: '"use strict";\nvar global = globalThis;',
}, },
outfile: "resources/public/js/libs.js", outfile: "resources/public/js/libs.js",
plugins: [fixReactVirtualized, rebuildNotify], plugins: [fixReactVirtualized, rebuildNotify],

11
frontend/shadow-cljs.edn
View File

@@ -6,13 +6,12 @@
:builds :builds
{:main {:main
{:target :browser {:target :esm
:output-dir "resources/public/js/" :output-dir "resources/public/js/"
:asset-path "/js" :asset-path "/js"
:devtools {:watch-dir "resources/public" :devtools {:watch-dir "resources/public"
:reload-strategy :full} :reload-strategy :full}
:build-options {:manifest-name "manifest.json"} :build-options {:manifest-name "manifest.json"}
:module-loader true
:modules :modules
{:shared {:shared
{:entries []} {:entries []}
@@ -20,7 +19,7 @@
:main :main
{:entries [app.main app.plugins.api] {:entries [app.main app.plugins.api]
:depends-on #{:shared} :depends-on #{:shared}
:init-fn app.main/init} :exports {init app.main/init}}
:util-highlight :util-highlight
{:entries [app.util.code-highlight] {:entries [app.util.code-highlight]
@@ -50,12 +49,12 @@
:render :render
{:entries [app.render] {:entries [app.render]
:depends-on #{:shared} :depends-on #{:shared}
:init-fn app.render/init} :exports {init app.render/init}}
:rasterizer :rasterizer
{:entries [app.rasterizer] {:entries [app.rasterizer]
:depends-on #{:shared} :depends-on #{:shared}
:init-fn app.rasterizer/init}} :exports {init app.rasterizer/init}}}
:js-options :js-options
{:entry-keys ["module" "browser" "main"] {:entry-keys ["module" "browser" "main"]
@@ -75,8 +74,6 @@
:compiler-options :compiler-options
{:fn-invoke-direct true {:fn-invoke-direct true
:optimizations #shadow/env ["PENPOT_BUILD_OPTIMIZATIONS" :as :keyword :default :advanced] :optimizations #shadow/env ["PENPOT_BUILD_OPTIMIZATIONS" :as :keyword :default :advanced]
:output-wrapper true
:rename-prefix-namespace "PENPOT"
:source-map true :source-map true
:elide-asserts true :elide-asserts true
:anon-fn-naming-policy :off :anon-fn-naming-policy :off

17
frontend/src/app/main/ui.cljs
View File

@@ -31,27 +31,28 @@
[app.main.ui.static :as static] [app.main.ui.static :as static]
[app.util.dom :as dom] [app.util.dom :as dom]
[app.util.i18n :refer [tr]] [app.util.i18n :refer [tr]]
[app.util.modules :as mod]
[app.util.theme :as theme] [app.util.theme :as theme]
[beicon.v2.core :as rx] [beicon.v2.core :as rx]
[rumext.v2 :as mf])) [rumext.v2 :as mf]))
(def auth-page (def auth-page
(mf/lazy-component app.main.ui.auth/auth)) (mf/lazy #(mod/load 'app.main.ui.auth/auth-page*)))
(def verify-token-page (def verify-token-page*
(mf/lazy-component app.main.ui.auth.verify-token/verify-token)) (mf/lazy #(mod/load 'app.main.ui.auth.verify-token/verify-token-page*)))
(def viewer-page* (def viewer-page*
(mf/lazy-component app.main.ui.viewer/viewer*)) (mf/lazy #(mod/load 'app.main.ui.viewer/viewer-page*)))
(def dashboard-page* (def dashboard-page*
(mf/lazy-component app.main.ui.dashboard/dashboard*)) (mf/lazy #(mod/load 'app.main.ui.dashboard/dashboard-page*)))
(def settings-page* (def settings-page*
(mf/lazy-component app.main.ui.settings/settings*)) (mf/lazy #(mod/load 'app.main.ui.settings/settings-page*)))
(def workspace-page* (def workspace-page*
(mf/lazy-component app.main.ui.workspace/workspace*)) (mf/lazy #(mod/load 'app.main.ui.workspace/workspace-page*)))
(mf/defc workspace-legacy-redirect* (mf/defc workspace-legacy-redirect*
{::mf/props :obj {::mf/props :obj
@@ -189,7 +190,7 @@
[:? [:& auth-page {:route route}]] [:? [:& auth-page {:route route}]]
:auth-verify-token :auth-verify-token
[:? [:& verify-token-page {:route route}]] [:? [:& verify-token-page* {:route route}]]
(:settings-profile (:settings-profile
:settings-password :settings-password

9
frontend/src/app/main/ui/auth.cljs
View File

@@ -19,8 +19,7 @@
[app.util.i18n :as i18n :refer [tr]] [app.util.i18n :as i18n :refer [tr]]
[rumext.v2 :as mf])) [rumext.v2 :as mf]))
(mf/defc auth (mf/defc auth*
{::mf/props :obj}
[{:keys [route]}] [{:keys [route]}]
(let [section (dm/get-in route [:data :name]) (let [section (dm/get-in route [:data :name])
is-register (or is-register (or
@@ -69,3 +68,9 @@
(when (= section :auth-register) (when (= section :auth-register)
[:& terms-register])]])) [:& terms-register])]]))
(mf/defc auth-page*
{::mf/lazy-load true}
[props]
[:> auth* props])

9
frontend/src/app/main/ui/auth/verify_token.cljs
View File

@@ -61,8 +61,8 @@
(rt/nav :auth-login) (rt/nav :auth-login)
(ntf/warn (tr "errors.unexpected-token")))) (ntf/warn (tr "errors.unexpected-token"))))
(mf/defc verify-token (mf/defc verify-token*
[{:keys [route] :as props}] [{:keys [route]}]
(let [token (get-in route [:query-params :token]) (let [token (get-in route [:query-params :token])
bad-token (mf/use-state false)] bad-token (mf/use-state false)]
@@ -99,3 +99,8 @@
[:> static/invalid-token {}] [:> static/invalid-token {}]
[:> loader* {:title (tr "labels.loading") [:> loader* {:title (tr "labels.loading")
:overlay true}]))) :overlay true}])))
(mf/defc verify-token-page*
{::mf/lazy-load true}
[props]
[:> verify-token* props])

14
frontend/src/app/main/ui/components/code_block.cljs
View File

@@ -8,13 +8,13 @@
(:require-macros [app.main.style :as stl]) (:require-macros [app.main.style :as stl])
(:require (:require
[app.common.data.macros :as dm] [app.common.data.macros :as dm]
[app.util.modules :as modules]
[cuerdas.core :as str] [cuerdas.core :as str]
[promesa.core :as p] [promesa.core :as p]
[rumext.v2 :as mf] [rumext.v2 :as mf]))
[shadow.lazy :as lazy]))
(def highlight-fn (def highlight-fn
(lazy/loadable app.util.code-highlight/highlight!)) (delay (modules/load-fn 'app.util.code-highlight/highlight!)))
(mf/defc code-block (mf/defc code-block
{::mf/wrap-props false} {::mf/wrap-props false}
@@ -24,8 +24,12 @@
(mf/with-effect [code type] (mf/with-effect [code type]
(when-let [node (mf/ref-val block-ref)] (when-let [node (mf/ref-val block-ref)]
(p/let [highlight-fn (lazy/load highlight-fn)] (->> @highlight-fn
(highlight-fn node)))) (p/fmap (fn [f] (f)))
(p/fnly (fn [f cause]
(if cause
(js/console.error cause)
(f node)))))))
[:pre {:class (dm/str type " " (stl/css :code-display)) :ref block-ref} code])) [:pre {:class (dm/str type " " (stl/css :code-display)) :ref block-ref} code]))

6
frontend/src/app/main/ui/dashboard.cljs
View File

@@ -247,7 +247,6 @@
(swap! storage/session dissoc :template)))))) (swap! storage/session dissoc :template))))))
(mf/defc dashboard* (mf/defc dashboard*
{::mf/props :obj}
[{:keys [profile project-id team-id search-term plugin-url template section]}] [{:keys [profile project-id team-id search-term plugin-url template section]}]
(let [team (mf/deref refs/team) (let [team (mf/deref refs/team)
projects (mf/deref refs/projects) projects (mf/deref refs/projects)
@@ -313,3 +312,8 @@
:section section :section section
:search-term search-term :search-term search-term
:team team}]]])) :team team}]]]))
(mf/defc dashboard-page*
{::mf/lazy-load true}
[props]
[:> dashboard* props])

6
frontend/src/app/main/ui/settings.cljs
View File

@@ -78,3 +78,9 @@
:settings-notifications :settings-notifications
[:& notifications-page* {:profile profile}])]]]])) [:& notifications-page* {:profile profile}])]]]]))
(mf/defc settings-page*
{::mf/lazy-load true}
[props]
[:> settings* props])

6
frontend/src/app/main/ui/viewer.cljs
View File

@@ -624,7 +624,6 @@
;; --- Component: Viewer ;; --- Component: Viewer
(mf/defc viewer* (mf/defc viewer*
{::mf/props :obj}
[{:keys [file-id share-id page-id] :as props}] [{:keys [file-id share-id page-id] :as props}]
(mf/with-effect [file-id page-id share-id] (mf/with-effect [file-id page-id share-id]
(let [params {:file-id file-id (let [params {:file-id file-id
@@ -643,3 +642,8 @@
[:> loader* {:title (tr "labels.loading") [:> loader* {:title (tr "labels.loading")
:overlay true}])) :overlay true}]))
(mf/defc viewer-page*
{::mf/lazy-load true}
[props]
[:> viewer* props])

10
frontend/src/app/main/ui/workspace.cljs
View File

@@ -165,7 +165,7 @@
(dsh/lookup-page state file-id page-id)))) (dsh/lookup-page state file-id page-id))))
st/state)) st/state))
(mf/defc workspace-page* (mf/defc workspace-inner*
{::mf/private true} {::mf/private true}
[{:keys [page-id file-id file layout wglobal]}] [{:keys [page-id file-id file layout wglobal]}]
(let [page-ref (mf/with-memo [file-id page-id] (let [page-ref (mf/with-memo [file-id page-id]
@@ -252,10 +252,16 @@
:touch-action "none"}} :touch-action "none"}}
[:> context-menu*] [:> context-menu*]
(if (and file-loaded? page-id) (if (and file-loaded? page-id)
[:> workspace-page* [:> workspace-inner*
{:page-id page-id {:page-id page-id
:file-id file-id :file-id file-id
:file file :file file
:wglobal wglobal :wglobal wglobal
:layout layout}] :layout layout}]
[:> workspace-loader*])]]]]]])) [:> workspace-loader*])]]]]]]))
(mf/defc workspace-page*
{::mf/lazy-load true}
[props]
[:> workspace* props])

3
frontend/src/app/render_wasm/api.cljs
View File

@@ -40,6 +40,7 @@
[app.util.debug :as dbg] [app.util.debug :as dbg]
[app.util.functions :as fns] [app.util.functions :as fns]
[app.util.globals :as ug] [app.util.globals :as ug]
[app.util.modules :as mod]
[app.util.text.content :as tc] [app.util.text.content :as tc]
[beicon.v2.core :as rx] [beicon.v2.core :as rx]
[promesa.core :as p] [promesa.core :as p]
@@ -1361,7 +1362,7 @@
(delay (delay
(if (exists? js/dynamicImport) (if (exists? js/dynamicImport)
(let [uri (cf/resolve-static-asset "js/render_wasm.js")] (let [uri (cf/resolve-static-asset "js/render_wasm.js")]
(->> (js/dynamicImport (str uri)) (->> (mod/import uri)
(p/mcat init-wasm-module) (p/mcat init-wasm-module)
(p/fmap (p/fmap
(fn [default] (fn [default]

1
frontend/src/app/util/code_highlight.cljs
View File

@@ -10,6 +10,7 @@
[app.util.dom :as dom])) [app.util.dom :as dom]))
(defn highlight! (defn highlight!
{:lazy-loadable true}
[node] [node]
(dom/set-data! node "highlighted" nil) (dom/set-data! node "highlighted" nil)
(hljs/highlightElement node)) (hljs/highlightElement node))

2
frontend/src/app/util/globals.js
View File

@@ -20,7 +20,7 @@ goog.provide("app.util.globals");
goog.scope(function () { goog.scope(function () {
var self = app.util.globals; var self = app.util.globals;
self.global = goog.global; self.global = globalThis;
function createMockedEventEmitter(k) { function createMockedEventEmitter(k) {
/* Allow mocked objects to be event emitters, so other modules /* Allow mocked objects to be event emitters, so other modules

5
frontend/src/app/util/i18n.cljs
View File

@@ -92,8 +92,9 @@
is executed in the critical part (application bootstrap) and used in is executed in the critical part (application bootstrap) and used in
many parts of the application." many parts of the application."
[data] [data]
(reset! locale (or (get storage/global ::locale) (autodetect))) (set! translations data)
(set! translations data)) (reset! locale (or (get storage/global ::locale) (autodetect))))
(defn set-locale! (defn set-locale!
[lname] [lname]

17
frontend/src/app/util/modules.clj Normal file
View File

@@ -0,0 +1,17 @@
;; This Source Code Form is subject to the terms of the Mozilla Public
;; License, v. 2.0. If a copy of the MPL was not distributed with this
;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
;;
;; Copyright (c) KALEIDOS INC
(ns app.util.modules
(:refer-clojure :exclude [load resolve]))
(defmacro load
[thing]
`(-> (shadow.esm/load-by-name ~thing)
(.then (fn [f#] (cljs.core/js-obj "default" (f#))))))
(defmacro load-fn
[thing]
`(shadow.esm/load-by-name ~thing))

16
frontend/src/app/util/modules.cljs Normal file
View File

@@ -0,0 +1,16 @@
;; This Source Code Form is subject to the terms of the Mozilla Public
;; License, v. 2.0. If a copy of the MPL was not distributed with this
;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
;;
;; Copyright (c) KALEIDOS INC
(ns app.util.modules
(:refer-clojure :exclude [import])
(:require-macros [app.util.modules])
(:require
[shadow.esm :refer [dynamic-import]]))
(defn import
"Dynamic esm module import import"
[path]
(dynamic-import (str path)))

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

@@ -101,8 +101,8 @@
(rx/push! bus message)))) (rx/push! bus message))))
handle-error handle-error
(fn [error] (fn [event]
(on-error worker (.-data error)))] (on-error worker (.-data event)))]
(.addEventListener instance "message" handle-message) (.addEventListener instance "message" handle-message)
(.addEventListener instance "error" handle-error) (.addEventListener instance "error" handle-error)

6
frontend/src/app/worker/thumbnails.cljs
View File

@@ -20,12 +20,12 @@
[app.render-wasm.api :as wasm.api] [app.render-wasm.api :as wasm.api]
[app.render-wasm.wasm :as wasm] [app.render-wasm.wasm :as wasm]
[app.util.http :as http] [app.util.http :as http]
[app.util.modules :as mod]
[app.worker.impl :as impl] [app.worker.impl :as impl]
[beicon.v2.core :as rx] [beicon.v2.core :as rx]
[okulary.core :as l] [okulary.core :as l]
[promesa.core :as p] [promesa.core :as p]
[rumext.v2 :as mf] [rumext.v2 :as mf]))
[shadow.esm :refer (dynamic-import)]))
(log/set-level! :trace) (log/set-level! :trace)
@@ -101,7 +101,7 @@
(def init-wasm (def init-wasm
(delay (delay
(let [uri (cf/resolve-static-asset "js/render_wasm.js")] (let [uri (cf/resolve-static-asset "js/render_wasm.js")]
(-> (dynamic-import (str uri)) (-> (mod/import (str uri))
(p/then #(wasm.api/init-wasm-module %)) (p/then #(wasm.api/init-wasm-module %))
(p/then #(set! wasm/internal-module %)))))) (p/then #(set! wasm/internal-module %))))))