1
0
Эх сурвалжийг харах

refactor: simplify assets path

charlie 3 сар өмнө
parent
commit
e02dff3ff7

+ 1 - 1
gulpfile.js

@@ -129,10 +129,10 @@ const common = {
         'node_modules/photoswipe/dist/umd/*.js',
         'packages/amplify/dist/amplify.js',
         'packages/ui/dist/ui/ui.js',
+        'node_modules/@logseq/sqlite-wasm/sqlite-wasm/jswasm/sqlite3.wasm',
       ]).pipe(gulp.dest(path.join(outputPath, 'capacitor', 'js'))),
       () => gulp.src([
         'packages/ui/dist/ionic/*.js',
-        'node_modules/@logseq/sqlite-wasm/sqlite-wasm/jswasm/sqlite3.wasm',
       ]).pipe(gulp.dest(path.join(outputPath, 'capacitor'))),
     )(...params)
   },

+ 2 - 2
resources/capacitor/index.html

@@ -36,8 +36,8 @@ const portal = new MagicPortal(worker);
 <script defer src="./js/ui.js"></script>
 <script defer src="./js/amplify.js"></script>
 <script defer src="./ionic.js"></script>
-<script defer src="./shared.js"></script>
-<script defer src="./main.js"></script>
+<script defer src="./js/shared.js"></script>
+<script defer src="./js/main.js"></script>
 <script>
   document.addEventListener('DOMContentLoaded', () => {
     window.Capacitor?.Plugins?.SplashScreen?.hide()

+ 2 - 2
shadow-cljs.edn

@@ -89,8 +89,8 @@
                                    :depends-on #{:shared}
                                    :web-worker true}}
 
-                  :output-dir       "./static/capacitor"
-                  :asset-path       "./"
+                  :output-dir       "./static/capacitor/js"
+                  :asset-path       "./js"
                   :release          {:asset-path "http://localhost"}
                   :compiler-options {:infer-externs      :auto
                                      :output-feature-set :es-next-in

+ 1 - 7
src/main/frontend/persist_db/browser.cljs

@@ -85,13 +85,7 @@
 (defn start-db-worker!
   []
   (when-not util/node-test?
-    (let [worker-url (cond
-                       (util/electron?)
-                       "js/db-worker.js"
-                       (util/capacitor-new?)
-                       "db-worker.js"
-                       :else
-                       "static/js/db-worker.js")
+    (let [worker-url "js/db-worker.js"
           worker (js/Worker. (str worker-url "?electron=" (util/electron?) "&publishing=" config/publishing?))
           wrapped-worker* (Comlink/wrap worker)
           wrapped-worker (fn [qkw direct-pass? & args]