Merge branch 'master' into gesture-support-on-block

.github/workflows/build-android.yml

@@ -89,8 +89,8 @@ jobs:
           sed -i 's/defonce version ".*"/defonce version "${{ steps.ref.outputs.version }}"/g' src/main/frontend/version.cljs
           sed -i 's/versionName ".*"/versionName "${{ steps.ref.outputs.version }}"/g' android/app/build.gradle
 
-      - name: Compile CLJS
-        run: yarn install && yarn release
+      - name: Compile CLJS - android variant, use es6 instead of es-next
+        run: yarn install && yarn release-android-app
 
       - name: Upload Sentry Sourcemaps (beta only)
         if: ${{ inputs.build-target == 'beta' || github.event.inputs.build-target == 'beta' }}

package.json

@@ -34,6 +34,7 @@
         "app-watch": "run-p gulp:watch cljs:app-watch",
         "release": "run-s gulp:build cljs:release",
         "release-app": "run-s gulp:build cljs:release-app",
+        "release-android-app": "run-s gulp:build cljs:release-android-app",
         "dev-release-app": "run-s gulp:build cljs:dev-release-app",
         "dev-electron-app": "gulp electron",
         "release-electron": "run-s gulp:build && gulp electronMaker",
@@ -55,6 +56,7 @@
         "cljs:release": "clojure -M:cljs release app publishing electron",
         "cljs:release-electron": "clojure -M:cljs release app electron --debug && clojure -M:cljs release publishing",
         "cljs:release-app": "clojure -M:cljs release app",
+        "cljs:release-android-app": "clojure -M:cljs release app --config-merge '{:compiler-options {:output-feature-set :es6}}'",
         "cljs:test": "clojure -M:test compile test",
         "cljs:run-test": "node static/tests.js",
         "cljs:dev-release-app": "clojure -M:cljs release app --config-merge '{:closure-defines {frontend.config/DEV-RELEASE true}}'",

resources/package.json

@@ -36,7 +36,7 @@
     "https-proxy-agent": "5.0.0",
     "@sentry/electron": "2.5.1",
     "posthog-js": "1.10.2",
-    "@logseq/rsapi": "0.0.14",
+    "@logseq/rsapi": "0.0.16",
     "electron-deeplink": "1.0.10"
   },
   "devDependencies": {
@@ -52,8 +52,6 @@
     "electron-rebuild": "3.2.5"
   },
   "resolutions": {
-    "@electron-forge/cli/**/colors": "1.4.0",
-    "electron-rebuild/**/colors": "1.4.0",
-    "electron-builder/**/colors": "1.4.0"
+    "**/electron": "15.1.2"
   }
 }

src/test/frontend/handler/repo_test.cljs

@@ -100,7 +100,6 @@
 
       (is (= {:title 98 :id 98
               :updated-at 47 :created-at 47
-              :collapsed 22
               :card-last-score 6 :card-repeats 6 :card-next-schedule 6
               :card-last-interval 6 :card-ease-factor 6 :card-last-reviewed 6
               :alias 6}