node 18.18.0

This commit is contained in:
zadam 2023-09-21 12:29:11 +02:00
parent 75b7706c2c
commit 62ecd1ad76
5 changed files with 8 additions and 5 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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.