diff --git a/bin/build.sh b/bin/build.sh index e62582618..cd05b0d82 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -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 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/scrypt.node $WIN_RES_DIR/node_modules/scrypt/build/Release/ diff --git a/bin/deps/image/pngquant.exe b/bin/deps/image/pngquant.exe index 3ac8c3f0d..6783491a6 100644 Binary files a/bin/deps/image/pngquant.exe and b/bin/deps/image/pngquant.exe differ diff --git a/package-lock.json b/package-lock.json index 94c16a81c..d9623d1ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "trilium", - "version": "0.19.1", + "version": "0.20.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -10,22 +10,6 @@ "integrity": "sha1-J87C30Cd9gr1gnDtj2qlVAnqhvY=", "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": { "version": "2.2.1", "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", "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": { "version": "1.18.3", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz", @@ -5181,11 +5170,11 @@ } }, "for-each": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.2.tgz", - "integrity": "sha1-LEBFC5NI6X8oEyJZO6lnBLmr1NQ=", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", + "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", "requires": { - "is-function": "1.0.1" + "is-callable": "1.1.4" } }, "for-in": { @@ -6752,8 +6741,7 @@ "is-callable": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", - "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==", - "dev": true + "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==" }, "is-ci": { "version": "1.1.0", @@ -7287,18 +7275,17 @@ "dev": true }, "jimp": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/jimp/-/jimp-0.3.5.tgz", - "integrity": "sha512-V2pq7D1jImjZefgHjeoeOPbtt6Bz+F4HqV+v5GkxNthRfsBMMfk5h8DkTa05XYcXa1Qd5eb6YCQUYqHf7TZ2Gw==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/jimp/-/jimp-0.3.1.tgz", + "integrity": "sha512-3nv1uavBLwVdLMgiDrIPL+ABgvU1swPfsWAKXk+3t79vpMyiGtFNF9LnbXCmyprsptxEf6iOuCxhdqZPhldpvw==", "requires": { - "@babel/polyfill": "7.0.0-rc.1", "any-base": "1.1.0", "bmp-js": "0.1.0", "buffer": "5.2.0", "exif-parser": "0.1.12", - "file-type": "9.0.0", + "file-type": "8.1.0", "jpeg-js": "0.3.4", - "load-bmfont": "1.3.0", + "load-bmfont": "1.3.1", "mkdirp": "0.5.1", "omggif": "1.0.9", "phin": "2.9.1", @@ -7308,11 +7295,6 @@ "utif": "2.0.0" }, "dependencies": { - "bmp-js": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/bmp-js/-/bmp-js-0.1.0.tgz", - "integrity": "sha1-4Fpj95amwf8l9Hcex62twUjAcjM=" - }, "buffer": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.0.tgz", @@ -7323,24 +7305,16 @@ } }, "file-type": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/file-type/-/file-type-9.0.0.tgz", - "integrity": "sha512-Qe/5NJrgIOlwijpq3B7BEpzPFcgzggOTagZmkXQY4LA6bsXKTUstK7Wp12lEJ/mLKTpvIZxmIuRcLYWT6ov9lw==" - }, - "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==" + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-8.1.0.tgz", + "integrity": "sha512-qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ==" } } }, - "jpgjs": { - "version": "github:makr28/jpgjs#c83f107ad725b476a3441d20680a02590d8752cc" + "jpeg-js": { + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.3.4.tgz", + "integrity": "sha512-6IzjQxvnlT8UlklNmDXIJMWxijULjqGrzgqc0OG7YadZdvm7KPQ1j0ehmQQHckgEWOfgpptzcnWgESovxudpTA==" }, "js-base64": { "version": "2.4.8", @@ -7733,16 +7707,16 @@ "dev": true }, "load-bmfont": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/load-bmfont/-/load-bmfont-1.3.0.tgz", - "integrity": "sha1-u358cQ3mvK/LE8s7jIHgwBMey8k=", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/load-bmfont/-/load-bmfont-1.3.1.tgz", + "integrity": "sha512-lQkEawgez06lM2iw1vQEEOtVLJXyMzFcUqbwWMrB0g6zwhdUs/+e0KNd1zEJ7OFBbMVz0tbzQyjgjtTB47+PBg==", "requires": { "buffer-equal": "0.0.1", "mime": "1.4.1", "parse-bmfont-ascii": "1.0.6", "parse-bmfont-binary": "1.0.6", - "parse-bmfont-xml": "1.1.3", - "xhr": "2.4.1", + "parse-bmfont-xml": "1.1.4", + "xhr": "2.5.0", "xtend": "4.0.1" }, "dependencies": { @@ -9342,9 +9316,9 @@ "integrity": "sha1-0Di0dtPp3Z2x4RoLDlOiJ5K2kAY=" }, "parse-bmfont-xml": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/parse-bmfont-xml/-/parse-bmfont-xml-1.1.3.tgz", - "integrity": "sha1-1rZqNxr9OcUAfZ8O6yYqTyzOe3w=", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/parse-bmfont-xml/-/parse-bmfont-xml-1.1.4.tgz", + "integrity": "sha512-bjnliEOmGv3y1aMEfREMBJ9tfL3WR0i0CKPj61DnSLaoxWR3nLrsQrEbCId/8rF4NyRF0cCqisSVXyQYWM+mCQ==", "requires": { "xml-parse-from-string": "1.0.1", "xml2js": "0.4.19" @@ -9381,7 +9355,7 @@ "resolved": "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.1.tgz", "integrity": "sha1-aug6eqJanZtwCswoaYzR8e1+lTY=", "requires": { - "for-each": "0.3.2", + "for-each": "0.3.3", "trim": "0.0.1" } }, @@ -9498,7 +9472,7 @@ "resolved": "https://registry.npmjs.org/pixelmatch/-/pixelmatch-4.0.2.tgz", "integrity": "sha1-j0fc7FARtHe2fbA8JDvB8wheiFQ=", "requires": { - "pngjs": "3.3.1" + "pngjs": "3.3.3" } }, "pkg": { @@ -9906,9 +9880,9 @@ "dev": true }, "pngjs": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.3.1.tgz", - "integrity": "sha512-ggXCTsqHRIsGMkHlCEhbHhUmNTA2r1lpkE0NL4Q9S8spkXbm4vE9TVmPso2AGYn90Gltdz8W5CyzhcIGg2Gejg==" + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.3.3.tgz", + "integrity": "sha512-1n3Z4p3IOxArEs1VRXnZ/RXdfEniAUS9jb68g58FIXMNkPJeZd+Qh4Uq7/e0LVxAQGos1eIUrqrt4FpjdnEd+Q==" }, "posix-character-classes": { "version": "0.1.1", @@ -10583,7 +10557,8 @@ "regenerator-runtime": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", + "dev": true }, "regenerator-transform": { "version": "0.10.1", @@ -12856,6 +12831,11 @@ "requires": { "jpgjs": "github:makr28/jpgjs#c83f107ad725b476a3441d20680a02590d8752cc", "pako": "1.0.6" + }, + "dependencies": { + "jpgjs": { + "version": "github:makr28/jpgjs#c83f107ad725b476a3441d20680a02590d8752cc" + } } }, "util-deprecate": { @@ -13265,9 +13245,9 @@ "dev": true }, "xhr": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/xhr/-/xhr-2.4.1.tgz", - "integrity": "sha512-pAIU5vBr9Hiy5cpFIbPnwf0C18ZF86DBsZKrlsf87N5De/JbA6RJ83UP/cv+aljl4S40iRVMqP4pr4sF9Dnj0A==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/xhr/-/xhr-2.5.0.tgz", + "integrity": "sha512-4nlO/14t3BNUZRXIXfXe+3N6w3s1KoxcJUUURctd64BLRe67E4gRwp4PjywtDY72fXpZ1y6Ch0VZQRY/gMPzzQ==", "requires": { "global": "4.3.2", "is-function": "1.0.1", diff --git a/package.json b/package.json index b9be8bcd4..c4601bf26 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "imagemin-mozjpeg": "7.0.0", "imagemin-pngquant": "6.0.0", "ini": "1.3.5", - "jimp": "0.3.5", + "jimp": "0.3.1", "moment": "2.22.2", "multer": "1.3.1", "open": "0.0.5",