gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

build fixes

Browse Source
This commit is contained in:
azivner 2018-08-27 21:07:31 +02:00
parent 05c9c5db50
commit ad123cfc1a
4 changed files with 48 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/build.sh
View File

@ -23,7 +23,7 @@ WIN_RES_DIR=./dist/trilium-win32-x64/resources/app
cp -r bin/deps/sqlite/* $WIN_RES_DIR/node_modules/sqlite3/lib/binding/ cp -r bin/deps/sqlite/* $WIN_RES_DIR/node_modules/sqlite3/lib/binding/
cp bin/deps/image/cjpeg.exe $WIN_RES_DIR/node_modules/mozjpeg/vendor/ cp bin/deps/image/cjpeg.exe $WIN_RES_DIR/node_modules/mozjpeg/vendor/
cp bin/deps/image/pngquant.exe $WIN_RES_DIR/node_modules/pngquant-bin/vendor/ cp bin/deps/image/pngquant.exe $WIN_RES_DIR/node_modules/imagemin-pngquant/node_modules/pngquant-bin/vendor/
cp bin/deps/image/gifsicle.exe $WIN_RES_DIR/node_modules/giflossy/vendor/ cp bin/deps/image/gifsicle.exe $WIN_RES_DIR/node_modules/giflossy/vendor/
cp bin/deps/scrypt.node $WIN_RES_DIR/node_modules/scrypt/build/Release/ cp bin/deps/scrypt.node $WIN_RES_DIR/node_modules/scrypt/build/Release/

BIN
bin/deps/image/pngquant.exe
View File

Binary file not shown.

112
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "trilium", "name": "trilium",
"version": "0.19.1", "version": "0.20.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -10,22 +10,6 @@
"integrity": "sha1-J87C30Cd9gr1gnDtj2qlVAnqhvY=", "integrity": "sha1-J87C30Cd9gr1gnDtj2qlVAnqhvY=",
"dev": true "dev": true
}, },
"@babel/polyfill": {
"version": "7.0.0-rc.1",
"resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.0.0-rc.1.tgz",
"integrity": "sha512-x6s1nu32T0Ayzh/d0SXB4UPIZNcK7Oc01tmZQEhBVwFeOF+ynUlyS4b+zKX1kfbjD7o4qF6PXvDXLRX6i28hsA==",
"requires": {
"core-js": "2.5.7",
"regenerator-runtime": "0.11.1"
},
"dependencies": {
"core-js": {
"version": "2.5.7",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
"integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw=="
}
}
},
"@mrmlnc/readdir-enhanced": { "@mrmlnc/readdir-enhanced": {
"version": "2.2.1", "version": "2.2.1",
"resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
@ -1479,6 +1463,11 @@
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
"integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==" "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
}, },
"bmp-js": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/bmp-js/-/bmp-js-0.1.0.tgz",
"integrity": "sha1-4Fpj95amwf8l9Hcex62twUjAcjM="
},
"body-parser": { "body-parser": {
"version": "1.18.3", "version": "1.18.3",
"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz",
@ -5181,11 +5170,11 @@
} }
}, },
"for-each": { "for-each": {
"version": "0.3.2", "version": "0.3.3",
"resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.2.tgz", "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
"integrity": "sha1-LEBFC5NI6X8oEyJZO6lnBLmr1NQ=", "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
"requires": { "requires": {
"is-function": "1.0.1" "is-callable": "1.1.4"
} }
}, },
"for-in": { "for-in": {
@ -6752,8 +6741,7 @@
"is-callable": { "is-callable": {
"version": "1.1.4", "version": "1.1.4",
"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
"integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==", "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="
"dev": true
}, },
"is-ci": { "is-ci": {
"version": "1.1.0", "version": "1.1.0",
@ -7287,18 +7275,17 @@
"dev": true "dev": true
}, },
"jimp": { "jimp": {
"version": "0.3.5", "version": "0.3.1",
"resolved": "https://registry.npmjs.org/jimp/-/jimp-0.3.5.tgz", "resolved": "https://registry.npmjs.org/jimp/-/jimp-0.3.1.tgz",
"integrity": "sha512-V2pq7D1jImjZefgHjeoeOPbtt6Bz+F4HqV+v5GkxNthRfsBMMfk5h8DkTa05XYcXa1Qd5eb6YCQUYqHf7TZ2Gw==", "integrity": "sha512-3nv1uavBLwVdLMgiDrIPL+ABgvU1swPfsWAKXk+3t79vpMyiGtFNF9LnbXCmyprsptxEf6iOuCxhdqZPhldpvw==",
"requires": { "requires": {
"@babel/polyfill": "7.0.0-rc.1",
"any-base": "1.1.0", "any-base": "1.1.0",
"bmp-js": "0.1.0", "bmp-js": "0.1.0",
"buffer": "5.2.0", "buffer": "5.2.0",
"exif-parser": "0.1.12", "exif-parser": "0.1.12",
"file-type": "9.0.0", "file-type": "8.1.0",
"jpeg-js": "0.3.4", "jpeg-js": "0.3.4",
"load-bmfont": "1.3.0", "load-bmfont": "1.3.1",
"mkdirp": "0.5.1", "mkdirp": "0.5.1",
"omggif": "1.0.9", "omggif": "1.0.9",
"phin": "2.9.1", "phin": "2.9.1",
@ -7308,11 +7295,6 @@
"utif": "2.0.0" "utif": "2.0.0"
}, },
"dependencies": { "dependencies": {
"bmp-js": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/bmp-js/-/bmp-js-0.1.0.tgz",
"integrity": "sha1-4Fpj95amwf8l9Hcex62twUjAcjM="
},
"buffer": { "buffer": {
"version": "5.2.0", "version": "5.2.0",
"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.0.tgz", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.0.tgz",
@ -7323,24 +7305,16 @@
} }
}, },
"file-type": { "file-type": {
"version": "9.0.0", "version": "8.1.0",
"resolved": "https://registry.npmjs.org/file-type/-/file-type-9.0.0.tgz", "resolved": "https://registry.npmjs.org/file-type/-/file-type-8.1.0.tgz",
"integrity": "sha512-Qe/5NJrgIOlwijpq3B7BEpzPFcgzggOTagZmkXQY4LA6bsXKTUstK7Wp12lEJ/mLKTpvIZxmIuRcLYWT6ov9lw==" "integrity": "sha512-qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ=="
},
"jpeg-js": {
"version": "0.3.4",
"resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.3.4.tgz",
"integrity": "sha512-6IzjQxvnlT8UlklNmDXIJMWxijULjqGrzgqc0OG7YadZdvm7KPQ1j0ehmQQHckgEWOfgpptzcnWgESovxudpTA=="
},
"pngjs": {
"version": "3.3.3",
"resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.3.3.tgz",
"integrity": "sha512-1n3Z4p3IOxArEs1VRXnZ/RXdfEniAUS9jb68g58FIXMNkPJeZd+Qh4Uq7/e0LVxAQGos1eIUrqrt4FpjdnEd+Q=="
} }
} }
}, },
"jpgjs": { "jpeg-js": {
"version": "github:makr28/jpgjs#c83f107ad725b476a3441d20680a02590d8752cc" "version": "0.3.4",
"resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.3.4.tgz",
"integrity": "sha512-6IzjQxvnlT8UlklNmDXIJMWxijULjqGrzgqc0OG7YadZdvm7KPQ1j0ehmQQHckgEWOfgpptzcnWgESovxudpTA=="
}, },
"js-base64": { "js-base64": {
"version": "2.4.8", "version": "2.4.8",
@ -7733,16 +7707,16 @@
"dev": true "dev": true
}, },
"load-bmfont": { "load-bmfont": {
"version": "1.3.0", "version": "1.3.1",
"resolved": "https://registry.npmjs.org/load-bmfont/-/load-bmfont-1.3.0.tgz", "resolved": "https://registry.npmjs.org/load-bmfont/-/load-bmfont-1.3.1.tgz",
"integrity": "sha1-u358cQ3mvK/LE8s7jIHgwBMey8k=", "integrity": "sha512-lQkEawgez06lM2iw1vQEEOtVLJXyMzFcUqbwWMrB0g6zwhdUs/+e0KNd1zEJ7OFBbMVz0tbzQyjgjtTB47+PBg==",
"requires": { "requires": {
"buffer-equal": "0.0.1", "buffer-equal": "0.0.1",
"mime": "1.4.1", "mime": "1.4.1",
"parse-bmfont-ascii": "1.0.6", "parse-bmfont-ascii": "1.0.6",
"parse-bmfont-binary": "1.0.6", "parse-bmfont-binary": "1.0.6",
"parse-bmfont-xml": "1.1.3", "parse-bmfont-xml": "1.1.4",
"xhr": "2.4.1", "xhr": "2.5.0",
"xtend": "4.0.1" "xtend": "4.0.1"
}, },
"dependencies": { "dependencies": {
@ -9342,9 +9316,9 @@
"integrity": "sha1-0Di0dtPp3Z2x4RoLDlOiJ5K2kAY=" "integrity": "sha1-0Di0dtPp3Z2x4RoLDlOiJ5K2kAY="
}, },
"parse-bmfont-xml": { "parse-bmfont-xml": {
"version": "1.1.3", "version": "1.1.4",
"resolved": "https://registry.npmjs.org/parse-bmfont-xml/-/parse-bmfont-xml-1.1.3.tgz", "resolved": "https://registry.npmjs.org/parse-bmfont-xml/-/parse-bmfont-xml-1.1.4.tgz",
"integrity": "sha1-1rZqNxr9OcUAfZ8O6yYqTyzOe3w=", "integrity": "sha512-bjnliEOmGv3y1aMEfREMBJ9tfL3WR0i0CKPj61DnSLaoxWR3nLrsQrEbCId/8rF4NyRF0cCqisSVXyQYWM+mCQ==",
"requires": { "requires": {
"xml-parse-from-string": "1.0.1", "xml-parse-from-string": "1.0.1",
"xml2js": "0.4.19" "xml2js": "0.4.19"
@ -9381,7 +9355,7 @@
"resolved": "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.1.tgz", "resolved": "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.1.tgz",
"integrity": "sha1-aug6eqJanZtwCswoaYzR8e1+lTY=", "integrity": "sha1-aug6eqJanZtwCswoaYzR8e1+lTY=",
"requires": { "requires": {
"for-each": "0.3.2", "for-each": "0.3.3",
"trim": "0.0.1" "trim": "0.0.1"
} }
}, },
@ -9498,7 +9472,7 @@
"resolved": "https://registry.npmjs.org/pixelmatch/-/pixelmatch-4.0.2.tgz", "resolved": "https://registry.npmjs.org/pixelmatch/-/pixelmatch-4.0.2.tgz",
"integrity": "sha1-j0fc7FARtHe2fbA8JDvB8wheiFQ=", "integrity": "sha1-j0fc7FARtHe2fbA8JDvB8wheiFQ=",
"requires": { "requires": {
"pngjs": "3.3.1" "pngjs": "3.3.3"
} }
}, },
"pkg": { "pkg": {
@ -9906,9 +9880,9 @@
"dev": true "dev": true
}, },
"pngjs": { "pngjs": {
"version": "3.3.1", "version": "3.3.3",
"resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.3.1.tgz", "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.3.3.tgz",
"integrity": "sha512-ggXCTsqHRIsGMkHlCEhbHhUmNTA2r1lpkE0NL4Q9S8spkXbm4vE9TVmPso2AGYn90Gltdz8W5CyzhcIGg2Gejg==" "integrity": "sha512-1n3Z4p3IOxArEs1VRXnZ/RXdfEniAUS9jb68g58FIXMNkPJeZd+Qh4Uq7/e0LVxAQGos1eIUrqrt4FpjdnEd+Q=="
}, },
"posix-character-classes": { "posix-character-classes": {
"version": "0.1.1", "version": "0.1.1",
@ -10583,7 +10557,8 @@
"regenerator-runtime": { "regenerator-runtime": {
"version": "0.11.1", "version": "0.11.1",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
"integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
"dev": true
}, },
"regenerator-transform": { "regenerator-transform": {
"version": "0.10.1", "version": "0.10.1",
@ -12856,6 +12831,11 @@
"requires": { "requires": {
"jpgjs": "github:makr28/jpgjs#c83f107ad725b476a3441d20680a02590d8752cc", "jpgjs": "github:makr28/jpgjs#c83f107ad725b476a3441d20680a02590d8752cc",
"pako": "1.0.6" "pako": "1.0.6"
},
"dependencies": {
"jpgjs": {
"version": "github:makr28/jpgjs#c83f107ad725b476a3441d20680a02590d8752cc"
}
} }
}, },
"util-deprecate": { "util-deprecate": {
@ -13265,9 +13245,9 @@
"dev": true "dev": true
}, },
"xhr": { "xhr": {
"version": "2.4.1", "version": "2.5.0",
"resolved": "https://registry.npmjs.org/xhr/-/xhr-2.4.1.tgz", "resolved": "https://registry.npmjs.org/xhr/-/xhr-2.5.0.tgz",
"integrity": "sha512-pAIU5vBr9Hiy5cpFIbPnwf0C18ZF86DBsZKrlsf87N5De/JbA6RJ83UP/cv+aljl4S40iRVMqP4pr4sF9Dnj0A==", "integrity": "sha512-4nlO/14t3BNUZRXIXfXe+3N6w3s1KoxcJUUURctd64BLRe67E4gRwp4PjywtDY72fXpZ1y6Ch0VZQRY/gMPzzQ==",
"requires": { "requires": {
"global": "4.3.2", "global": "4.3.2",
"is-function": "1.0.1", "is-function": "1.0.1",

2
package.json
View File

@ -49,7 +49,7 @@
"imagemin-mozjpeg": "7.0.0", "imagemin-mozjpeg": "7.0.0",
"imagemin-pngquant": "6.0.0", "imagemin-pngquant": "6.0.0",
"ini": "1.3.5", "ini": "1.3.5",
"jimp": "0.3.5", "jimp": "0.3.1",
"moment": "2.22.2", "moment": "2.22.2",
"multer": "1.3.1", "multer": "1.3.1",
"open": "0.0.5", "open": "0.0.5",