diff --git a/package-lock.json b/package-lock.json index a015a48f2..b27ed15c4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "trilium", - "version": "0.35.2", + "version": "0.36.0-beta", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -6950,9 +6950,9 @@ "dev": true }, "is-wsl": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", - "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.1.tgz", + "integrity": "sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog==" }, "is-yarn-global": { "version": "0.3.0", @@ -9066,11 +9066,11 @@ "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=" }, "open": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz", - "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/open/-/open-7.0.0.tgz", + "integrity": "sha512-K6EKzYqnwQzk+/dzJAQSBORub3xlBTxMz+ntpZpH/LyCa1o6KjXhuN+2npAaI9jaSmU3R1Q8NWf4KUWcyytGsQ==", "requires": { - "is-wsl": "^1.1.0" + "is-wsl": "^2.1.0" } }, "open-editor": { @@ -9082,6 +9082,23 @@ "env-editor": "^0.4.0", "line-column-path": "^2.0.0", "open": "^6.2.0" + }, + "dependencies": { + "is-wsl": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", + "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=", + "dev": true + }, + "open": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz", + "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==", + "dev": true, + "requires": { + "is-wsl": "^1.1.0" + } + } } }, "optionator": { diff --git a/package.json b/package.json index e527b9539..ce079afcd 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "moment": "2.24.0", "multer": "1.4.2", "node-abi": "2.11.0", - "open": "6.4.0", + "open": "7.0.0", "pngjs": "3.4.0", "portscanner": "2.2.0", "rand-token": "0.4.0", diff --git a/src/public/javascripts/services/note_detail_book.js b/src/public/javascripts/services/note_detail_book.js index 03286738f..a6114f224 100644 --- a/src/public/javascripts/services/note_detail_book.js +++ b/src/public/javascripts/services/note_detail_book.js @@ -195,7 +195,7 @@ class NoteDetailBook { if (utils.isElectron()) { const open = require("open"); - open(getFileUrl()); + open(getFileUrl(), {url: true}); } else { window.location.href = getFileUrl(); diff --git a/src/public/javascripts/services/note_detail_file.js b/src/public/javascripts/services/note_detail_file.js index 5986e1c08..69e8f111f 100644 --- a/src/public/javascripts/services/note_detail_file.js +++ b/src/public/javascripts/services/note_detail_file.js @@ -23,7 +23,7 @@ class NoteDetailFile { if (utils.isElectron()) { const open = require("open"); - open(this.getFileUrl()); + open(this.getFileUrl(), {url: true}); } else { window.location.href = this.getFileUrl();