gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

upgrade electron to 25 and node to 18

Browse Source
This commit is contained in:
zadam 2023-05-04 21:01:25 +02:00
parent 9b32d86f78
commit c0cf319521
8 changed files with 67 additions and 663 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitpod.yml
View File

@ -2,7 +2,7 @@ image:
file: .gitpod.dockerfile file: .gitpod.dockerfile
tasks: tasks:
- before: nvm install 16.19.1 && nvm use 16.19.1 - before: nvm install 18.16.0 && nvm use 18.16.0
init: npm install init: npm install
command: npm run start-server command: npm run start-server

2
Dockerfile
View File

@ -1,5 +1,5 @@
# !!! Don't try to build this Dockerfile directly, run it through bin/build-docker.sh script !!! # !!! Don't try to build this Dockerfile directly, run it through bin/build-docker.sh script !!!
FROM node:16.19.1-alpine FROM node:18.16.0-alpine
# Create app directory # Create app directory
WORKDIR /usr/src/app WORKDIR /usr/src/app

2
bin/build-server.sh
View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
PKG_DIR=dist/trilium-linux-x64-server PKG_DIR=dist/trilium-linux-x64-server
NODE_VERSION=16.19.1 NODE_VERSION=18.16.0
if [ "$1" != "DONTCOPY" ] if [ "$1" != "DONTCOPY" ]
then then

4
bin/copy-trilium.sh
View File

@ -5,7 +5,7 @@ if [[ $# -eq 0 ]] ; then
exit 1 exit 1
fi fi
n exec 16.19.1 npm run webpack n exec 18.16.0 npm run webpack
DIR=$1 DIR=$1
@ -27,7 +27,7 @@ cp -r electron.js $DIR/
cp webpack-* $DIR/ cp webpack-* $DIR/
# run in subshell (so we return to original dir) # run in subshell (so we return to original dir)
(cd $DIR && n exec 16.19.1 npm install --only=prod) (cd $DIR && n exec 18.16.0 npm install --only=prod)
# cleanup of useless files in dependencies # cleanup of useless files in dependencies
rm -r $DIR/node_modules/image-q/demo rm -r $DIR/node_modules/image-q/demo

709
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
package.json
View File

@ -37,7 +37,7 @@
"archiver": "5.3.1", "archiver": "5.3.1",
"async-mutex": "0.4.0", "async-mutex": "0.4.0",
"axios": "1.4.0", "axios": "1.4.0",
"better-sqlite3": "7.4.5", "better-sqlite3": "8.3.0",
"chokidar": "3.5.3", "chokidar": "3.5.3",
"cls-hooked": "4.2.2", "cls-hooked": "4.2.2",
"commonmark": "0.30.0", "commonmark": "0.30.0",
@ -97,7 +97,7 @@
}, },
"devDependencies": { "devDependencies": {
"cross-env": "7.0.3", "cross-env": "7.0.3",
"electron": "16.2.8", "electron": "25.0.0-beta.1",
"electron-builder": "23.6.0", "electron-builder": "23.6.0",
"electron-packager": "17.1.1", "electron-packager": "17.1.1",
"electron-rebuild": "3.2.9", "electron-rebuild": "3.2.9",

2
src/public/app/widgets/watched_file_update_status.js
View File

@ -60,8 +60,6 @@ export default class WatchedFileUpdateStatusWidget extends NoteContextAwareWidge
const { entityType, entityId } = this.getEntity(); const { entityType, entityId } = this.getEntity();
const status = fileWatcher.getFileModificationStatus(entityType, entityId); const status = fileWatcher.getFileModificationStatus(entityType, entityId);
console.log("status", status);
this.$filePath.text(status.filePath); this.$filePath.text(status.filePath);
this.$fileLastModified.text(dayjs.unix(status.lastModifiedMs / 1000).format("HH:mm:ss")); this.$fileLastModified.text(dayjs.unix(status.lastModifiedMs / 1000).format("HH:mm:ss"));
} }

5
src/services/notes.js
View File

@ -883,7 +883,10 @@ function eraseUnusedBlobs() {
FROM blobs FROM blobs
LEFT JOIN notes ON notes.blobId = blobs.blobId LEFT JOIN notes ON notes.blobId = blobs.blobId
LEFT JOIN attachments ON attachments.blobId = blobs.blobId LEFT JOIN attachments ON attachments.blobId = blobs.blobId
WHERE notes.noteId IS NULL AND attachments.attachmentId IS NULL`); LEFT JOIN note_revisions ON attachments.blobId = blobs.blobId
WHERE notes.noteId IS NULL
AND attachments.attachmentId IS NULL
AND note_revisions.noteRevisionId IS NULL`);
sql.executeMany(`DELETE FROM blobs WHERE blobId IN (???)`, unusedBlobIds); sql.executeMany(`DELETE FROM blobs WHERE blobId IN (???)`, unusedBlobIds);