Skip to content
This repository was archived by the owner on Jun 24, 2025. It is now read-only.

Commit 3466786

Browse files
committed
Merge branch 'develop' of ssh://github.com/TriliumNext/Notes into develop
2 parents 0f7446c + b58b7a6 commit 3466786

File tree

247 files changed

+2078
-1830
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

247 files changed

+2078
-1830
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
branches:
55
- 'develop'
66
- 'feature/update*'
7+
- 'feature/server_esm*'
78
paths-ignore:
89
- 'docs/**'
910

.vscode/tasks.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"type": "npm",
6+
"script": "errors",
7+
"problemMatcher": "$tsc-watch",
8+
"isBackground": true,
9+
"presentation": {
10+
"revealProblems": "never"
11+
},
12+
"runOptions": {
13+
"runOn": "folderOpen"
14+
}
15+
}
16+
]
17+
}

bin/better-sqlite3/linux-desktop-better_sqlite3.node

100644100755
85.3 KB
Binary file not shown.

bin/better-sqlite3/linux-server-better_sqlite3.node

100644100755
89.2 KB
Binary file not shown.

bin/better-sqlite3/mac-arm64-better_sqlite3.node

100644100755
67.9 KB
Binary file not shown.

bin/better-sqlite3/mac-x64-better_sqlite3.node

100644100755
-160 KB
Binary file not shown.

bin/better-sqlite3/update.sh

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#!/usr/bin/env bash
2+
ELECTRON_VERSION="electron-v125"
3+
NODE_VERSION="node-v115"
4+
5+
if ! command -v jq &> /dev/null; then
6+
echo "Missing command: jq"
7+
exit 1
8+
fi
9+
10+
script_dir=$(realpath $(dirname $0))
11+
cd "$script_dir"
12+
BETTER_SQLITE3_VERSION=$(jq -r '.dependencies.["better-sqlite3"]' ../../package.json | grep -oP "\d+\.\d+\.\d+")
13+
14+
if [ -z $BETTER_SQLITE3_VERSION ]; then
15+
echo "Unable to determine better-sqlite3 version."
16+
exit 2
17+
fi
18+
19+
echo "Version: $BETTER_SQLITE3_VERSION"
20+
21+
function download() {
22+
version="$1"
23+
platform="$2"
24+
dest_name="$3"
25+
url=https://github.com/WiseLibs/better-sqlite3/releases/download/v${BETTER_SQLITE3_VERSION}/better-sqlite3-v${BETTER_SQLITE3_VERSION}-${version}-${platform}.tar.gz
26+
temp_file="temp.tar.gz"
27+
curl -L "$url" -o "$temp_file"
28+
tar -xzvf "$temp_file"
29+
mv build/Release/better_sqlite3.node "$dest_name-better_sqlite3.node"
30+
rm -rf build
31+
rm -f "$temp_file"
32+
}
33+
34+
download $NODE_VERSION "linux-x64" "linux-server"
35+
download $ELECTRON_VERSION "linux-x64" "linux-desktop"
36+
download $ELECTRON_VERSION "win32-x64" "win"
37+
download $ELECTRON_VERSION "darwin-x64" "mac-x64"
38+
download $ELECTRON_VERSION "darwin-arm64" "mac-arm64"
-76 KB
Binary file not shown.

bin/build-debian.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/usr/bin/env bash
22

3+
set -e # Fail on any command error
4+
35
if ! command -v dpkg-deb &> /dev/null; then
46
echo "Missing command: dpkg-deb"
57
exit 1

bin/build-docker.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/usr/bin/env bash
22

3+
set -e # Fail on any command error
4+
35
VERSION=`jq -r ".version" package.json`
46
SERIES=${VERSION:0:4}-latest
57

0 commit comments

Comments
 (0)