fixed builds for linux desktop

This commit is contained in:
zadam 2020-08-22 23:07:31 +02:00
parent ed6181a85e
commit 08c612c876
8 changed files with 382 additions and 450 deletions

Binary file not shown.

View file

@ -7,15 +7,11 @@ then
./bin/copy-trilium.sh $SRC_DIR
fi
echo "Copying required linux-x64 binaries"
rm -r $SRC_DIR/node_modules/sqlite3/lib/binding/*
rm -r $SRC_DIR/node_modules/pngquant-bin/vendor/*
rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
cp -r bin/deps/linux-x64/sqlite/* $SRC_DIR/node_modules/sqlite3/lib/binding/
cp bin/deps/linux-x64/image/pngquant $SRC_DIR/node_modules/pngquant-bin/vendor/
echo "Copying required linux-x64 binaries"
cp -r bin/better-sqlite3/linux-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=linux --arch=x64 --overwrite
@ -41,4 +37,4 @@ tar cJf trilium-linux-x64-${VERSION}.tar.xz trilium-linux-x64
cd ..
bin/build-debian.sh
bin/build-debian.sh

805
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -25,7 +25,7 @@
},
"dependencies": {
"async-mutex": "0.2.4",
"axios": "0.19.2",
"axios": "0.20.0",
"better-sqlite3": "7.1.0",
"body-parser": "1.19.0",
"cls-hooked": "4.2.2",
@ -54,11 +54,12 @@
"jimp": "0.16.0",
"mime-types": "2.1.27",
"multer": "1.4.2",
"node-abi": "2.18.0",
"open": "7.1.0",
"node-abi": "2.19.0",
"open": "7.2.0",
"portscanner": "2.2.0",
"rand-token": "1.0.1",
"rcedit": "2.2.0",
"request": "^2.88.2",
"rimraf": "3.0.2",
"sanitize-filename": "1.6.3",
"sanitize-html": "1.27.3",
@ -77,15 +78,15 @@
},
"devDependencies": {
"cross-env": "7.0.2",
"electron": "10.0.0-beta.23",
"electron": "10.0.0-beta.25",
"electron-builder": "22.8.0",
"electron-packager": "15.0.0",
"electron-rebuild": "1.11.0",
"electron-packager": "15.1.0",
"electron-rebuild": "2.0.0",
"esm": "3.2.25",
"jasmine": "3.6.1",
"jsdoc": "3.6.5",
"lorem-ipsum": "2.0.3",
"webpack": "5.0.0-beta.22",
"webpack": "5.0.0-beta.28",
"webpack-cli": "4.0.0-beta.8"
},
"optionalDependencies": {