Merge remote-tracking branch 'upstream/master' into whiteboards

This commit is contained in:
Peng Xiao
2022-08-09 09:47:00 +08:00
21 changed files with 133 additions and 84 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "Logseq-local-test-revert-me-back",
"version": "0.7.9",
"version": "0.8.0",
"main": "electron.js",
"author": "Logseq",
"license": "AGPL-3.0",
@@ -12,7 +12,7 @@
"electron:make": "electron-forge make",
"electron:make-macos-arm64": "electron-forge make --platform=darwin --arch=arm64",
"electron:publish:github": "electron-forge publish",
"rebuild:better-sqlite3": "electron-rebuild -v 15.1.2 -f -w better-sqlite3",
"rebuild:better-sqlite3": "electron-rebuild -v 19.0.10 -f -w better-sqlite3",
"postinstall": "install-app-deps"
},
"config": {
@@ -47,13 +47,13 @@
"@electron-forge/maker-rpm": "^6.0.0-beta.57",
"@electron-forge/maker-squirrel": "^6.0.0-beta.57",
"@electron-forge/maker-zip": "^6.0.0-beta.57",
"electron": "15.1.2",
"electron": "19.0.10",
"electron-builder": "^22.11.7",
"electron-forge-maker-appimage": "trusktr/electron-forge-maker-appimage#patch-1",
"electron-rebuild": "3.2.5"
},
"resolutions": {
"**/electron": "15.1.2",
"**/electron": "19.0.10",
"**/node-gyp": "9.0.0"
}
}