From 62ecd1ad76c3fdbcdd7b9fe2bf7ef9691aba4cdf Mon Sep 17 00:00:00 2001 From: zadam Date: Thu, 21 Sep 2023 12:29:11 +0200 Subject: [PATCH] node 18.18.0 --- .gitpod.yml | 2 +- Dockerfile | 2 +- bin/build-server.sh | 2 +- bin/copy-trilium.sh | 4 ++-- electron.js | 3 +++ 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index 4a6c0299a..7c304f56a 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -2,7 +2,7 @@ image: file: .gitpod.dockerfile tasks: - - before: nvm install 18.16.1 && nvm use 18.16.1 + - before: nvm install 18.18.0 && nvm use 18.18.0 init: npm install command: npm run start-server diff --git a/Dockerfile b/Dockerfile index 7677ea8b3..85c17226d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # !!! Don't try to build this Dockerfile directly, run it through bin/build-docker.sh script !!! -FROM node:18.16.1-alpine +FROM node:18.18.0-alpine # Create app directory WORKDIR /usr/src/app diff --git a/bin/build-server.sh b/bin/build-server.sh index 74a4896d6..a3624814a 100755 --- a/bin/build-server.sh +++ b/bin/build-server.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash PKG_DIR=dist/trilium-linux-x64-server -NODE_VERSION=18.16.1 +NODE_VERSION=18.18.0 if [ "$1" != "DONTCOPY" ] then diff --git a/bin/copy-trilium.sh b/bin/copy-trilium.sh index 2f4053e15..c009d16a2 100755 --- a/bin/copy-trilium.sh +++ b/bin/copy-trilium.sh @@ -5,7 +5,7 @@ if [[ $# -eq 0 ]] ; then exit 1 fi -n exec 18.16.1 npm run webpack +n exec 18.18.0 npm run webpack DIR=$1 @@ -27,7 +27,7 @@ cp -r electron.js $DIR/ cp webpack-* $DIR/ # run in subshell (so we return to original dir) -(cd $DIR && n exec 18.16.1 npm install --only=prod) +(cd $DIR && n exec 18.18.0 npm install --only=prod) # cleanup of useless files in dependencies rm -r $DIR/node_modules/image-q/demo diff --git a/electron.js b/electron.js index f32f992ab..2de1425a4 100644 --- a/electron.js +++ b/electron.js @@ -13,6 +13,9 @@ appIconService.installLocalAppIcon(); require('electron-dl')({ saveAs: true }); +// needed for excalidraw export https://github.com/zadam/trilium/issues/4271 +app.commandLine.appendSwitch("enable-experimental-web-platform-features"); + // Quit when all windows are closed, except on macOS. There, it's common // for applications and their menu bar to stay active until the user quits // explicitly with Cmd + Q.