diff --git a/.gitpod.yml b/.gitpod.yml
index ab7e12a82..8a4a9a03b 100644
--- a/.gitpod.yml
+++ b/.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
diff --git a/Dockerfile b/Dockerfile
index 018d634e9..7be0d0a39 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:16.14.2-alpine
+FROM node:16.15.0-alpine
# Create app directory
WORKDIR /usr/src/app
diff --git a/bin/build-server.sh b/bin/build-server.sh
index 518b7c125..1df3e0b54 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=16.14.2
+NODE_VERSION=16.15.0
if [ "$1" != "DONTCOPY" ]
then
diff --git a/bin/copy-trilium.sh b/bin/copy-trilium.sh
index 7d85d8a59..22998a749 100755
--- a/bin/copy-trilium.sh
+++ b/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
diff --git a/dump-db/README.md b/dump-db/README.md
index 7145f22d1..38f3f42b0 100644
--- a/dump-db/README.md
+++ b/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
diff --git a/package-lock.json b/package-lock.json
index 92b9d4dd7..36bc60d66 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,7 +32,7 @@
"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",
@@ -46,7 +46,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",
@@ -5759,9 +5759,9 @@
}
},
"node_modules/helmet": {
- "version": "5.0.2",
- "resolved": "https://registry.npmjs.org/helmet/-/helmet-5.0.2.tgz",
- "integrity": "sha512-QWlwUZZ8BtlvwYVTSDTBChGf8EOcQ2LkGMnQJxSzD1mUu8CCjXJZq/BXP8eWw4kikRnzlhtYo3lCk0ucmYA3Vg==",
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/helmet/-/helmet-5.1.0.tgz",
+ "integrity": "sha512-klsunXs8rgNSZoaUrNeuCiWUxyc+wzucnEnFejUg3/A+CaF589k9qepLZZ1Jehnzig7YbD4hEuscGXuBY3fq+g==",
"engines": {
"node": ">=12.0.0"
}
@@ -7413,9 +7413,9 @@
"dev": true
},
"node_modules/node-abi": {
- "version": "3.15.0",
- "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.15.0.tgz",
- "integrity": "sha512-Ic6z/j6I9RLm4ov7npo1I48UQr2BEyFCqh6p7S1dhEx9jPO0GPGq/e2Rb7x7DroQrmiVMz/Bw1vJm9sPAl2nxA==",
+ "version": "3.21.0",
+ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.21.0.tgz",
+ "integrity": "sha512-0ChvtQmmNYzXju0fjG0Vfg72q2D8FxUhluvV9uqivtXsKblSekJE2juxfg+9HoSgqPMqCmVEC/GHHtGzi4xYTg==",
"dependencies": {
"semver": "^7.3.5"
},
@@ -15303,9 +15303,9 @@
"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
},
"helmet": {
- "version": "5.0.2",
- "resolved": "https://registry.npmjs.org/helmet/-/helmet-5.0.2.tgz",
- "integrity": "sha512-QWlwUZZ8BtlvwYVTSDTBChGf8EOcQ2LkGMnQJxSzD1mUu8CCjXJZq/BXP8eWw4kikRnzlhtYo3lCk0ucmYA3Vg=="
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/helmet/-/helmet-5.1.0.tgz",
+ "integrity": "sha512-klsunXs8rgNSZoaUrNeuCiWUxyc+wzucnEnFejUg3/A+CaF589k9qepLZZ1Jehnzig7YbD4hEuscGXuBY3fq+g=="
},
"hosted-git-info": {
"version": "2.8.9",
@@ -16577,9 +16577,9 @@
"dev": true
},
"node-abi": {
- "version": "3.15.0",
- "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.15.0.tgz",
- "integrity": "sha512-Ic6z/j6I9RLm4ov7npo1I48UQr2BEyFCqh6p7S1dhEx9jPO0GPGq/e2Rb7x7DroQrmiVMz/Bw1vJm9sPAl2nxA==",
+ "version": "3.21.0",
+ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.21.0.tgz",
+ "integrity": "sha512-0ChvtQmmNYzXju0fjG0Vfg72q2D8FxUhluvV9uqivtXsKblSekJE2juxfg+9HoSgqPMqCmVEC/GHHtGzi4xYTg==",
"requires": {
"semver": "^7.3.5"
}
diff --git a/package.json b/package.json
index 7d417ddbd..1cbd862b4 100644
--- a/package.json
+++ b/package.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",
diff --git a/src/public/app/services/app_context.js b/src/public/app/services/app_context.js
index f48ecef4f..77cb59796 100644
--- a/src/public/app/services/app_context.js
+++ b/src/public/app/services/app_context.js
@@ -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 {
diff --git a/trilium.iml b/trilium.iml
index cffe441d0..bfa02661b 100644
--- a/trilium.iml
+++ b/trilium.iml
@@ -14,6 +14,7 @@
+