upgrades

Author: zadam

.gitpod.yml

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

Dockerfile

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

bin/build-server.sh

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

bin/copy-trilium.sh

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

dump-db/README.md

@@ -6,7 +6,7 @@ It is meant as a last resort solution when the standard mean to access your data
 
 ## Installation
 
-This tool requires node.js, testing has been done on 16.14.2, but it will probably work on other versions as well.
+This tool requires node.js, testing has been done on 16.15.0, but it will probably work on other versions as well.
 
 ```
 npm install

package-lock.json

@@ -25,6 +25,7 @@
     "postinstall": "rimraf ./node_modules/canvas"
   },
   "dependencies": {
+    "@electron/remote": "2.0.8",
     "@excalidraw/excalidraw": "0.11.0",
     "archiver": "5.3.1",
     "async-mutex": "0.3.2",
@@ -41,13 +42,12 @@
     "electron-dl": "3.3.1",
     "electron-find": "1.0.7",
     "electron-window-state": "5.0.3",
-    "@electron/remote": "2.0.8",
     "express": "4.18.1",
     "express-partial-content": "1.0.2",
     "express-rate-limit": "6.4.0",
     "express-session": "1.17.3",
     "fs-extra": "10.1.0",
-    "helmet": "5.0.2",
+    "helmet": "5.1.0",
     "html": "1.0.0",
     "html2plaintext": "2.1.4",
     "http-proxy-agent": "5.0.0",
@@ -61,7 +61,7 @@
     "jsdom": "19.0.0",
     "mime-types": "2.1.35",
     "multer": "1.4.4",
-    "node-abi": "3.15.0",
+    "node-abi": "3.21.0",
     "normalize-strings": "1.1.1",
     "open": "8.4.0",
     "portscanner": "2.2.0",

package.json

@@ -11,7 +11,6 @@ import Component from "../widgets/component.js";
 import keyboardActionsService from "./keyboard_actions.js";
 import MobileScreenSwitcherExecutor from "../widgets/mobile_widgets/mobile_screen_switcher.js";
 import MainTreeExecutors from "./main_tree_executors.js";
-import protectedSessionHolder from "./protected_session_holder.js";
 import toast from "./toast.js";
 
 class AppContext extends Component {

src/public/app/services/app_context.js

@@ -14,6 +14,7 @@
       <excludeFolder url="file://$MODULE_DIR$/docs" />
       <excludeFolder url="file://$MODULE_DIR$/bin/better-sqlite3" />
       <excludeFolder url="file://$MODULE_DIR$/data" />
+      <excludeFolder url="file://$MODULE_DIR$/.flatpak-builder" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />