Browse Source

Merge branch 'master' into enhance/ios-folder-picker

charlie 3 years ago
parent
commit
d4589b1272

+ 4 - 1
resources/forge.config.js

@@ -50,7 +50,10 @@ module.exports = {
     },
     {
       name: 'electron-forge-maker-appimage',
-      platforms: ['linux']
+      platforms: ['linux'],
+      config: {
+        mimeType: ["x-scheme-handler/logseq"]
+      }
     }
   ],
 

+ 2 - 1
resources/package.json

@@ -1,5 +1,6 @@
 {
   "name": "Logseq",
+  "productName": "Logseq",
   "version": "0.8.10",
   "main": "electron.js",
   "author": "Logseq",
@@ -50,7 +51,7 @@
     "@electron-forge/maker-zip": "^6.0.0-beta.57",
     "electron": "19.0.12",
     "electron-builder": "^22.11.7",
-    "electron-forge-maker-appimage": "trusktr/electron-forge-maker-appimage#patch-1",
+    "electron-forge-maker-appimage": "https://github.com/logseq/electron-forge-maker-appimage.git",
     "electron-rebuild": "3.2.5"
   },
   "resolutions": {

+ 1 - 2
src/main/frontend/core.cljs

@@ -13,8 +13,7 @@
             [reitit.frontend.easy :as rfe]
             [logseq.api]
             [frontend.fs.sync :as sync]
-            [frontend.config :as config]
-            [frontend.util :as util]))
+            [frontend.config :as config]))
 
 (defn set-router!
   []

+ 1 - 0
src/main/frontend/fs/sync.cljs

@@ -167,6 +167,7 @@
 (defn- get-ignored-files
   []
   (into #{#"logseq/graphs-txid.edn$"
+          #"logseq/pages-metadata.edn$"
           #"logseq/version-files/"
           #"logseq/bak/"
           #"node_modules/"