Merge branch 'feat/outliner-core' of github.com:logseq/logseq into feat/outliner-core

pull/1735/head
Tienson Qin 2021-04-30 18:52:34 +08:00
commit 30ab1ed952
8 changed files with 13 additions and 21 deletions

View File

@ -2,33 +2,24 @@ const path = require('path')
module.exports = { module.exports = {
packagerConfig: { packagerConfig: {
icon: './icons/logseq_big_sur.icns', icon: './icons/canary/logseq_big_sur.icns',
osxSign: { name: 'Logseq Canary',
identity: 'Developer ID Application: Tiansheng Qin',
'hardened-runtime': true,
entitlements: 'entitlements.plist',
'entitlements-inherit': 'entitlements.plist',
'signature-flags': 'library'
},
osxNotarize: {
appleId: "my-fake-apple-id",
appleIdPassword: "my-fake-apple-id-password",
},
}, },
makers: [ makers: [
{ {
'name': '@electron-forge/maker-squirrel', 'name': '@electron-forge/maker-squirrel',
'config': { 'config': {
'name': 'Logseq', title: 'Logseq Canary',
'setupIcon': './icons/logseq.ico' name: 'LogseqCanary', // ID name
setupIcon: './icons/canary/logseq.ico'
} }
}, },
{ {
name: '@electron-forge/maker-dmg', name: '@electron-forge/maker-dmg',
config: { config: {
format: 'ULFO', format: 'ULFO',
icon: './icons/logseq_big_sur.icns', icon: './icons/canary/logseq_big_sur.icns',
name: 'Logseq' name: 'Logseq Canary'
} }
}, },
{ {

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 100 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

View File

@ -1,5 +1,5 @@
{ {
"name": "Logseq", "name": "Logseq-Canary",
"version": "0.0.1", "version": "0.0.1",
"main": "electron.js", "main": "electron.js",
"author": "Logseq", "author": "Logseq",

View File

@ -49,10 +49,11 @@
(defn setup-updater! [^js win] (defn setup-updater! [^js win]
;; manual/auto updater ;; manual/auto updater
(when-not linux? ;;(when-not linux?
(init-updater {:repo "logseq/logseq" ;; (init-updater {:repo "logseq/logseq"
:logger logger ;; :logger logger
:win win}))) ;; :win win}))
)
(defn setup-interceptor! [] (defn setup-interceptor! []
(.registerFileProtocol (.registerFileProtocol