diff --git a/bin/build-server.sh b/bin/build-server.sh index a15032fa1..8398b6a90 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=12.19.0 +NODE_VERSION=14.16.0 if [ "$1" != "DONTCOPY" ] then diff --git a/package-lock.json b/package-lock.json index c7ec5ebc1..104998203 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "trilium", - "version": "0.46.2-beta", + "version": "0.46.3-beta", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2612,6 +2612,11 @@ "integrity": "sha512-J7thop4u3mRTkYRQ+Vpfwy2G5Ehoy82I14+14W4YMDLKdWloI9gSzRbV30s/NckQGVJtPkWNcW4oMAUigTdqiQ==", "dev": true }, + "define-lazy-prop": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", + "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==" + }, "define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", @@ -2881,14 +2886,22 @@ } }, "electron": { - "version": "9.4.4", - "resolved": "https://registry.npmjs.org/electron/-/electron-9.4.4.tgz", - "integrity": "sha512-dcPlTrMWQu5xuSm6sYV42KK/BRIqh3erM8v/WtZqaDmG7pkCeJpvw26Dgbqhdt78XmqqGiN96giEe6A3S9vpAQ==", + "version": "12.0.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-12.0.0.tgz", + "integrity": "sha512-p6oxZ4LG82hopPGAsIMOjyoL49fr6cexyFNH0kADA9Yf+mJ72DN7bjvBG+6V7r6QKhwYgsSsW8RpxBeVOUbxVQ==", "dev": true, "requires": { "@electron/get": "^1.0.1", - "@types/node": "^12.0.12", + "@types/node": "^14.6.2", "extract-zip": "^1.0.3" + }, + "dependencies": { + "@types/node": { + "version": "14.14.33", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.33.tgz", + "integrity": "sha512-oJqcTrgPUF29oUP8AsUqbXGJNuPutsetaa9kTQAQce5Lx5dTYWV02ScBiT/k1BX/Z7pKeqedmvp39Wu4zR7N7g==", + "dev": true + } } }, "electron-builder": { @@ -6028,12 +6041,13 @@ } }, "open": { - "version": "7.4.2", - "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz", - "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/open/-/open-8.0.2.tgz", + "integrity": "sha512-NV5QmWJrTaNBLHABJyrb+nd5dXI5zfea/suWawBhkHzAbVhLLiJdrqMgxMypGK9Eznp2Ltoh7SAVkQ3XAucX7Q==", "requires": { - "is-docker": "^2.0.0", - "is-wsl": "^2.1.1" + "define-lazy-prop": "^2.0.0", + "is-docker": "^2.1.1", + "is-wsl": "^2.2.0" } }, "optionator": { diff --git a/package.json b/package.json index 4229670bf..085264966 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "mime-types": "2.1.29", "multer": "1.4.2", "node-abi": "2.21.0", - "open": "7.4.2", + "open": "8.0.2", "portscanner": "2.2.0", "rand-token": "1.0.1", "request": "^2.88.2", @@ -78,7 +78,7 @@ }, "devDependencies": { "cross-env": "7.0.3", - "electron": "9.4.4", + "electron": "12.0.0", "electron-builder": "22.10.5", "electron-packager": "15.2.0", "electron-rebuild": "2.3.5", diff --git a/src/services/window.js b/src/services/window.js index b4fc797bc..2c461c02e 100644 --- a/src/services/window.js +++ b/src/services/window.js @@ -59,6 +59,7 @@ async function createMainWindow() { webPreferences: { enableRemoteModule: true, nodeIntegration: true, + contextIsolation: false, spellcheck: spellcheckEnabled }, frame: optionService.getOptionBool('nativeTitleBarVisible'),