mirror of
https://github.com/zadam/trilium.git
synced 2025-10-31 11:39:01 +01:00
Merge remote-tracking branch 'origin/feature/update_electron' into feature/server_esm_part3
This commit is contained in:
Elian Doran
commit
fd1f43d192
38
bin/better-sqlite3/update.sh
Executable file
38
bin/better-sqlite3/update.sh
Executable file
@ -0,0 +1,38 @@
|
||||
#!/usr/bin/env bash
|
||||
ELECTRON_VERSION="electron-v125"
|
||||
NODE_VERSION="node-v115"
|
||||
|
||||
if ! command -v jq &> /dev/null; then
|
||||
echo "Missing command: jq"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
script_dir=$(realpath $(dirname $0))
|
||||
cd "$script_dir"
|
||||
BETTER_SQLITE3_VERSION=$(jq -r '.dependencies.["better-sqlite3"]' ../../package.json | grep -oP "\d+\.\d+\.\d+")
|
||||
|
||||
if [ -z $BETTER_SQLITE3_VERSION ]; then
|
||||
echo "Unable to determine better-sqlite3 version."
|
||||
exit 2
|
||||
fi
|
||||
|
||||
echo "Version: $BETTER_SQLITE3_VERSION"
|
||||
|
||||
function download() {
|
||||
version="$1"
|
||||
platform="$2"
|
||||
dest_name="$3"
|
||||
url=https://github.com/WiseLibs/better-sqlite3/releases/download/v${BETTER_SQLITE3_VERSION}/better-sqlite3-v${BETTER_SQLITE3_VERSION}-${version}-${platform}.tar.gz
|
||||
temp_file="temp.tar.gz"
|
||||
curl -L "$url" -o "$temp_file"
|
||||
tar -xzvf "$temp_file"
|
||||
mv build/Release/better_sqlite3.node "$dest_name-better_sqlite3.node"
|
||||
rm -rf build
|
||||
rm -f "$temp_file"
|
||||
}
|
||||
|
||||
download $NODE_VERSION "linux-x64" "linux-server"
|
||||
download $ELECTRON_VERSION "linux-x64" "linux-desktop"
|
||||
download $ELECTRON_VERSION "win32-x64" "win"
|
||||
download $ELECTRON_VERSION "darwin-x64" "mac-x64"
|
||||
download $ELECTRON_VERSION "darwin-arm64" "mac-arm64"
|
||||
32
package-lock.json
generated
32
package-lock.json
generated
@ -59,7 +59,7 @@
|
||||
"mermaid": "^10.9.1",
|
||||
"mime-types": "2.1.35",
|
||||
"multer": "1.4.5-lts.1",
|
||||
"node-abi": "3.56.0",
|
||||
"node-abi": "^3.65.0",
|
||||
"normalize-strings": "1.1.1",
|
||||
"panzoom": "9.4.3",
|
||||
"print-this": "2.0.0",
|
||||
@ -121,7 +121,7 @@
|
||||
"@types/ws": "^8.5.10",
|
||||
"@types/xml2js": "^0.4.14",
|
||||
"cross-env": "7.0.3",
|
||||
"electron": "25.9.8",
|
||||
"electron": "^31.2.1",
|
||||
"electron-packager": "17.1.2",
|
||||
"electron-rebuild": "3.2.9",
|
||||
"esm": "3.2.25",
|
||||
@ -2476,9 +2476,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@types/node": {
|
||||
"version": "20.14.10",
|
||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.10.tgz",
|
||||
"integrity": "sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ==",
|
||||
"version": "20.14.11",
|
||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.11.tgz",
|
||||
"integrity": "sha512-kprQpL8MMeszbz6ojB5/tU8PLN4kesnN8Gjzw349rDlNgsSzg90lAVj3llK99Dh7JON+t9AuscPPFW6mPbTnSA==",
|
||||
"dependencies": {
|
||||
"undici-types": "~5.26.4"
|
||||
}
|
||||
@ -5810,13 +5810,13 @@
|
||||
}
|
||||
},
|
||||
"node_modules/electron": {
|
||||
"version": "25.9.8",
|
||||
"resolved": "https://registry.npmjs.org/electron/-/electron-25.9.8.tgz",
|
||||
"integrity": "sha512-PGgp6PH46QVENHuAHc2NT1Su8Q1qov7qIl2jI5tsDpTibwV2zD8539AeWBQySeBU4dhbj9onIl7+1bXQ0wefBg==",
|
||||
"version": "31.2.1",
|
||||
"resolved": "https://registry.npmjs.org/electron/-/electron-31.2.1.tgz",
|
||||
"integrity": "sha512-g3CLKjl4yuXt6VWm/KpgEjYYhFiCl19RgUn8lOC8zV/56ZXAS3+mqV4wWzicE/7vSYXs6GRO7vkYRwrwhX3Gaw==",
|
||||
"hasInstallScript": true,
|
||||
"dependencies": {
|
||||
"@electron/get": "^2.0.0",
|
||||
"@types/node": "^18.11.18",
|
||||
"@types/node": "^20.9.0",
|
||||
"extract-zip": "^2.0.1"
|
||||
},
|
||||
"bin": {
|
||||
@ -6253,14 +6253,6 @@
|
||||
"node": ">=6 <7 || >=8"
|
||||
}
|
||||
},
|
||||
"node_modules/electron/node_modules/@types/node": {
|
||||
"version": "18.19.39",
|
||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.39.tgz",
|
||||
"integrity": "sha512-nPwTRDKUctxw3di5b4TfT3I0sWDiWoPQCZjXhvdkINntwr8lcoVCKsTgnXeRubKIlfnV+eN/HYk6Jb40tbcEAQ==",
|
||||
"dependencies": {
|
||||
"undici-types": "~5.26.4"
|
||||
}
|
||||
},
|
||||
"node_modules/elkjs": {
|
||||
"version": "0.9.2",
|
||||
"resolved": "https://registry.npmjs.org/elkjs/-/elkjs-0.9.2.tgz",
|
||||
@ -10225,9 +10217,9 @@
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/node-abi": {
|
||||
"version": "3.56.0",
|
||||
"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.56.0.tgz",
|
||||
"integrity": "sha512-fZjdhDOeRcaS+rcpve7XuwHBmktS1nS1gzgghwKUQQ8nTy2FdSDr6ZT8k6YhvlJeHmmQMYiT/IH9hfco5zeW2Q==",
|
||||
"version": "3.65.0",
|
||||
"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.65.0.tgz",
|
||||
"integrity": "sha512-ThjYBfoDNr08AWx6hGaRbfPwxKV9kVzAzOzlLKbk2CuqXE2xnCh+cbAGnwM3t8Lq4v9rUB7VfondlkBckcJrVA==",
|
||||
"dependencies": {
|
||||
"semver": "^7.3.5"
|
||||
},
|
||||
|
||||
@ -96,7 +96,7 @@
|
||||
"mermaid": "^10.9.1",
|
||||
"mime-types": "2.1.35",
|
||||
"multer": "1.4.5-lts.1",
|
||||
"node-abi": "3.56.0",
|
||||
"node-abi": "^3.65.0",
|
||||
"normalize-strings": "1.1.1",
|
||||
"panzoom": "9.4.3",
|
||||
"print-this": "2.0.0",
|
||||
@ -155,7 +155,7 @@
|
||||
"@types/ws": "^8.5.10",
|
||||
"@types/xml2js": "^0.4.14",
|
||||
"cross-env": "7.0.3",
|
||||
"electron": "25.9.8",
|
||||
"electron": "^31.2.1",
|
||||
"electron-packager": "17.1.2",
|
||||
"electron-rebuild": "3.2.9",
|
||||
"esm": "3.2.25",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user