From 0a2807c0b3fb7809d1cd1be3a051d127db010b5e Mon Sep 17 00:00:00 2001 From: zadam Date: Fri, 25 Jun 2021 21:26:15 +0200 Subject: [PATCH 1/3] update to electron 13.1.4 which fixes the PDF display on Windows, closes #1976 --- package-lock.json | 20 ++++++++++---------- package.json | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 41e10d0c8..3b53d395a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "trilium", - "version": "0.47.3", + "version": "0.47.4", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2898,9 +2898,9 @@ } }, "electron": { - "version": "13.0.1", - "resolved": "https://registry.npmjs.org/electron/-/electron-13.0.1.tgz", - "integrity": "sha512-ds1cf0m46nStil0jbM2r9W/p+Kprdq22+2MikIUqEu69eGl1c86IinQVrpmJ9bR4RshDSF4j3uD32a0bsHDMnQ==", + "version": "13.1.4", + "resolved": "https://registry.npmjs.org/electron/-/electron-13.1.4.tgz", + "integrity": "sha512-4qhRZbRvGqHmMWsCG/kRVF4X8VIq9Nujgm+gXZLBSpiR6uUtMHy7ViBTQZl1PGf6O9Ppxhpr9Yz+k6Um9WoP3Q==", "dev": true, "requires": { "@electron/get": "^1.0.1", @@ -2909,9 +2909,9 @@ }, "dependencies": { "@types/node": { - "version": "14.17.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.1.tgz", - "integrity": "sha512-/tpUyFD7meeooTRwl3sYlihx2BrJE7q9XF71EguPFIySj9B7qgnRtHsHTho+0AUm4m1SvWGm6uSncrR94q6Vtw==", + "version": "14.17.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.4.tgz", + "integrity": "sha512-8kQ3+wKGRNN0ghtEn7EGps/B8CzuBz1nXZEIGGLP2GnwbqYn4dbTs7k+VKLTq1HvZLRCIDtN3Snx1Ege8B7L5A==", "dev": true } } @@ -5685,9 +5685,9 @@ "dev": true }, "node-abi": { - "version": "2.29.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.29.0.tgz", - "integrity": "sha512-+xu2xkzOkdVS0YAVpiF+xsYM+hM1ylmeGUaG1OC3To6+pUIL4yoCqU6ggWpZeeiq0GFPE2uUOCf36Y4iq3JnOA==", + "version": "2.30.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.0.tgz", + "integrity": "sha512-g6bZh3YCKQRdwuO/tSZZYJAw622SjsRfJ2X0Iy4sSOHZ34/sPPdVBn8fev2tj7njzLwuqPw9uMtGsGkO5kIQvg==", "requires": { "semver": "^5.4.1" }, diff --git a/package.json b/package.json index fccdc7cb0..f4ba58471 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "jsdom": "16.5.3", "mime-types": "2.1.30", "multer": "1.4.2", - "node-abi": "2.29.0", + "node-abi": "2.30.0", "open": "8.0.8", "portscanner": "2.2.0", "rand-token": "1.0.1", @@ -80,7 +80,7 @@ }, "devDependencies": { "cross-env": "7.0.3", - "electron": "13.0.1", + "electron": "13.1.4", "electron-builder": "22.11.1", "electron-packager": "15.2.0", "electron-rebuild": "2.3.5", From 995e6c2fef28a735fd021e2aa662c12930efd419 Mon Sep 17 00:00:00 2001 From: zadam Date: Fri, 25 Jun 2021 21:26:48 +0200 Subject: [PATCH 2/3] release 0.47.5 --- package.json | 2 +- src/services/build.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f4ba58471..2434e6150 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "trilium", "productName": "Trilium Notes", "description": "Trilium Notes", - "version": "0.47.4", + "version": "0.47.5", "license": "AGPL-3.0-only", "main": "electron.js", "bin": { diff --git a/src/services/build.js b/src/services/build.js index 9e5c7ea6d..9a75f322a 100644 --- a/src/services/build.js +++ b/src/services/build.js @@ -1 +1 @@ -module.exports = { buildDate:"2021-06-02T21:44:19+02:00", buildRevision: "f50bb2278caaea077b2273356808c173e8548ded" }; +module.exports = { buildDate:"2021-06-25T21:26:48+02:00", buildRevision: "0a2807c0b3fb7809d1cd1be3a051d127db010b5e" }; From 61e78858bc3a20fec6a973b1bbbf21a89c5efa4a Mon Sep 17 00:00:00 2001 From: zadam Date: Tue, 29 Jun 2021 20:54:56 +0200 Subject: [PATCH 3/3] fix random ordering in search, fixes #2047 --- src/services/search/value_extractor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/search/value_extractor.js b/src/services/search/value_extractor.js index 6ff099ae2..9534fc3fc 100644 --- a/src/services/search/value_extractor.js +++ b/src/services/search/value_extractor.js @@ -114,7 +114,7 @@ class ValueExtractor { cursor = cursor.children[0]; } else if (cur() === 'random') { - return Math.random(); + return Math.random().toString(); // string is expected for comparison } else if (cur() in PROP_MAPPING) { return cursor[PROP_MAPPING[cur()]];