Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
"d3-force": "3.0.0",
"diff": "5.0.0",
"dompurify": "2.4.0",
"electron": "41.7.1",
"electron": "42.11.18",
"electron-dl": "^4.0.0",
"fs": "0.0.1-security",
"fs-extra": "9.1.0",
Expand Down
12 changes: 12 additions & 0 deletions resources/forge.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,18 @@ module.exports = {
}
],

hooks: {
// electron-forge-maker-appimage hardcodes app-builder-lib's default Electron icons with no config option
preMake: async () => {
const target = path.join(__dirname, 'node_modules/app-builder-lib/templates/icons/electron-linux')
if (!fs.existsSync(target)) return
const source = path.join(__dirname, 'icons/linux')
for (const file of fs.readdirSync(source)) {
fs.copyFileSync(path.join(source, file), path.join(target, file))
}
}
},

publishers: [
{
name: '@electron-forge/publisher-github',
Expand Down
Binary file added resources/icons/linux/128x128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/icons/linux/16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/icons/linux/256x256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/icons/linux/32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/icons/linux/48x48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/icons/linux/64x64.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 5 additions & 4 deletions resources/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "logseq-og",
"productName": "Logseq OG",
"desktopName": "Logseq OG.desktop",
"version": "1.0.0",
"main": "electron.js",
"author": "Logseq",
Expand All @@ -14,7 +15,7 @@
"electron:make-linux-arm64": "electron-forge make --platform=linux --arch=arm64",
"electron:make-macos-arm64": "electron-forge make --platform=darwin --arch=arm64",
"electron:publish:github": "electron-forge publish",
"rebuild:all": "electron-rebuild -v 41.7.1 -f",
"rebuild:all": "electron-rebuild -v 42.11.18 -f",
"postinstall": "install-app-deps"
},
"config": {
Expand All @@ -25,7 +26,7 @@
"@logseq/rsapi": "0.0.92",
"@sentry/electron": "2.5.1",
"abort-controller": "3.0.0",
"better-sqlite3": "12.10.0",
"better-sqlite3": "12.11.1",
"chokidar": "^3.5.1",
"command-exists": "1.2.9",
"diff-match-patch": "1.0.5",
Expand Down Expand Up @@ -55,12 +56,12 @@
"@electron-forge/maker-wix": "^7.8.3",
"@electron-forge/maker-zip": "^7.8.3",
"@electron/rebuild": "4.0.1",
"electron": "41.7.1",
"electron": "42.11.18",
"electron-builder": "26.0.12",
"electron-forge-maker-appimage": "https://github.com/logseq/electron-forge-maker-appimage.git"
},
"resolutions": {
"**/electron": "41.7.1",
"**/electron": "42.11.18",
"**/node-abi": "4.31.0",
"**/node-gyp": "12.0.0",
"string-width": "4.2.0",
Expand Down
57 changes: 33 additions & 24 deletions static/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,11 @@
dependencies:
chrome-trace-event "^1.0.3"

"@electron-internal/extract-zip@^1.0.1":
version "1.0.6"
resolved "https://registry.yarnpkg.com/@electron-internal/extract-zip/-/extract-zip-1.0.6.tgz#fb229ea9567feeecbb84ec8dd5a56c21e29b65ec"
integrity sha512-/aQLgFDdCSnwChfUwqekSmE1q2dCTzhUy5saIHBb5vyYn5LzWaKPaIz1wM0lDMCZYBoIG4svJNvAJb6vkI8BuA==

"@electron/asar@3.2.18":
version "3.2.18"
resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.18.tgz#fa607f829209bab8b9e0ce6658d3fe81b2cba517"
Expand Down Expand Up @@ -306,10 +311,10 @@
fs-extra "^9.0.1"
minimist "^1.2.5"

"@electron/get@^2.0.0":
version "2.0.3"
resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.3.tgz#fba552683d387aebd9f3fcadbcafc8e12ee4f960"
integrity sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ==
"@electron/get@^3.0.0":
version "3.1.0"
resolved "https://registry.yarnpkg.com/@electron/get/-/get-3.1.0.tgz#22c5a0bd917ab201badeb77bc4ad18cba54cb4ec"
integrity sha512-F+nKc0xW+kVbBRhFzaMgPy3KwmuNTYX1fx6+FxxoSnNgwYX6LD7AKBTWkU0MQ6IBoe7dz069CNkR673sPAgkCQ==
dependencies:
debug "^4.1.1"
env-paths "^2.2.0"
Expand All @@ -321,20 +326,19 @@
optionalDependencies:
global-agent "^3.0.0"

"@electron/get@^3.0.0":
version "3.1.0"
resolved "https://registry.yarnpkg.com/@electron/get/-/get-3.1.0.tgz#22c5a0bd917ab201badeb77bc4ad18cba54cb4ec"
integrity sha512-F+nKc0xW+kVbBRhFzaMgPy3KwmuNTYX1fx6+FxxoSnNgwYX6LD7AKBTWkU0MQ6IBoe7dz069CNkR673sPAgkCQ==
"@electron/get@^5.0.0":
version "5.1.0"
resolved "https://registry.yarnpkg.com/@electron/get/-/get-5.1.0.tgz#f96ca2a0e89b27490ff8f7b5a392bd4df6942998"
integrity sha512-3kSBtG8ObcTVfXanm5vVJ6UnBLEVmVsRk1M+vGqCuMBV+XLCbJYuWQful+yIy0GQDsSlK0kHEriEHn7SPk4EnA==
dependencies:
debug "^4.1.1"
env-paths "^2.2.0"
fs-extra "^8.1.0"
got "^11.8.5"
env-paths "^3.0.0"
graceful-fs "^4.2.11"
progress "^2.0.3"
semver "^6.2.0"
semver "^7.6.3"
sumchecker "^3.0.1"
optionalDependencies:
global-agent "^3.0.0"
undici "^7.24.4"

"@electron/node-gyp@https://github.com/electron/node-gyp#06b29aafb7708acef8b3669835c8a7857ebc92d2":
version "10.2.0-electron.1"
Expand Down Expand Up @@ -1698,10 +1702,10 @@ baseline-browser-mapping@^2.8.25:
resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.8.28.tgz#9ef511f5a7c19d74a94cafcbf951608398e9bdb3"
integrity sha512-gYjt7OIqdM0PcttNYP2aVrr2G0bMALkBaoehD4BuRGjAOtipg0b6wHg1yNL+s5zSnLZZrGHOw4IrND8CD+3oIQ==

better-sqlite3@12.10.0:
version "12.10.0"
resolved "https://registry.yarnpkg.com/better-sqlite3/-/better-sqlite3-12.10.0.tgz#bde622d14a18008583a53bc53501ae98f1a12221"
integrity sha512-CyzaZRQKyHkB2ZInfTTl2nvT33EbDpjkLEbE8/Zck3Ll6O0qqvuGdrJ45HgtH+HykRg88ITY3AdreBGN70aBSQ==
better-sqlite3@12.11.1:
version "12.11.1"
resolved "https://registry.yarnpkg.com/better-sqlite3/-/better-sqlite3-12.11.1.tgz#067846efabf7671957fc8a9e8df3be39c6cc0b84"
integrity sha512-dq9AtApgg5PGFtBzPFSBl3HZQjHok5gaQCM6zh2Yk0aSmDCs1CbnVI8/HgASQkNKsWFpseIO9beg5xxpYhbIfA==
dependencies:
bindings "^1.5.0"
prebuild-install "^7.1.1"
Expand Down Expand Up @@ -2583,14 +2587,14 @@ electron-wix-msi@^5.1.3:
optionalDependencies:
"@bitdisaster/exe-icon-extractor" "^1.0.10"

electron@*, electron@41.7.1:
version "41.7.1"
resolved "https://registry.yarnpkg.com/electron/-/electron-41.7.1.tgz#2b4f1979a3a9a96ef522512a76e7a7840f3b9382"
integrity sha512-pdRvNNP99Qfvs1lyIxo/sfIGAwJP0CrJFNCE3goFKc7/fV+kjK3EPxx5Nt6sLTkzqTyeRYylpwPUfpeGojiyyw==
electron@*, electron@42.11.18:
version "42.11.18"
resolved "https://registry.yarnpkg.com/electron/-/electron-42.11.18.tgz#2785cfd76815006df8ab2f392da9daa8f0dfc09b"
integrity sha512-hbzodG06x/l7uq+oeyob5ugv6qZBmJRWC7Uto5QEE99xSHUARz6d+++Rz+79T/ssTYTQkONW4ciTTcJuAbXKIQ==
dependencies:
"@electron/get" "^2.0.0"
"@electron-internal/extract-zip" "^1.0.1"
"@electron/get" "^5.0.0"
"@types/node" "^24.9.0"
extract-zip "^2.0.1"

emoji-regex@^8.0.0:
version "8.0.0"
Expand Down Expand Up @@ -2797,7 +2801,7 @@ external-editor@^3.1.0:
iconv-lite "^0.4.24"
tmp "^0.0.33"

extract-zip@2.0.1, extract-zip@^2.0.0, extract-zip@^2.0.1:
extract-zip@2.0.1, extract-zip@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==
Expand Down Expand Up @@ -5591,6 +5595,11 @@ undici-types@~7.16.0:
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.16.0.tgz#ffccdff36aea4884cbfce9a750a0580224f58a46"
integrity sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==

undici@^7.24.4:
version "7.30.1"
resolved "https://registry.yarnpkg.com/undici/-/undici-7.30.1.tgz#360b3de104b94abc52729aa1a4a07e027aa71f73"
integrity sha512-03KrMbjIFDWQR5RNPrSw3bd1r12JpyFQl9/yxjUbJtqkjmllqC5lFjZh6ujeuJCKr8EOQvRW872Oy/az+nLYxg==

unique-filename@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2"
Expand Down
Loading
Loading