Compare commits

...

3 Commits

Author SHA1 Message Date
zadam
995e6c2fef release 0.47.5 2021-06-25 21:26:48 +02:00
zadam
0a2807c0b3 update to electron 13.1.4 which fixes the PDF display on Windows, closes #1976 2021-06-25 21:26:15 +02:00
zadam
1a615398aa docker now uses node 14.17 as other builds 2021-06-02 23:37:55 +02:00
4 changed files with 15 additions and 15 deletions

View File

@@ -1,4 +1,4 @@
FROM node:12.19.0-alpine
FROM node:14.17.0-alpine
# Create app directory
WORKDIR /usr/src/app

20
package-lock.json generated
View File

@@ -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"
},

View File

@@ -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": {
@@ -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",

View File

@@ -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" };