diff --git a/package-lock.json b/package-lock.json index b27ed15c4..4ba4a0cb5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -244,21 +244,21 @@ } }, "@jimp/bmp": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.8.4.tgz", - "integrity": "sha512-Cf/V+SUyEVxCCP8q1emkarCHJ8NkLFcLp41VMqBihoR4ke0TIPfCSdgW/JXbM/28vvZ5a2bvMe6uOll6cFggvA==", + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.8.5.tgz", + "integrity": "sha512-o/23j1RODQGGjvb2xg+9ZQCHc9uXa5XIoJuXHN8kh8AJBGD7JZYiHMwNHaxJRJvadimCKUeA5udZUJAoaPwrYg==", "requires": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "bmp-js": "^0.1.0", "core-js": "^2.5.7" } }, "@jimp/core": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@jimp/core/-/core-0.8.4.tgz", - "integrity": "sha512-3fK5UEOEQsfSDhsrAgBT6W8Up51qkeCj9RVjusxUaEGmix34PO/KTVfzURlu6NOpOUvtfNXsCq9xS7cxBTWSCA==", + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/@jimp/core/-/core-0.8.5.tgz", + "integrity": "sha512-Jto1IdL5HYg7uE15rpQjK6dfZJ6d6gRjUsVCPW50nIfXgWizaTibFEov90W9Bj+irwKrX2ntG3e3pZUyOC0COg==", "requires": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "any-base": "^1.1.0", "buffer": "^5.2.0", "core-js": "^2.5.7", @@ -279,252 +279,252 @@ } }, "@jimp/custom": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@jimp/custom/-/custom-0.8.4.tgz", - "integrity": "sha512-iS/RB3QQKpm4QS8lxxtQzvYDMph9YvOn3d68gMM4pDKn95n3nt5/ySHFv6fQq/yzfox1OPdeYaXbOLvC3+ofqw==", + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/@jimp/custom/-/custom-0.8.5.tgz", + "integrity": "sha512-hS4qHOcOIL+N93IprsIhFgr8F4XnC2oYd+lRaOKEOg3ptS2vQnceSTtcXsC0//mhq8AV6lNjpbfs1iseEZuTqg==", "requires": { - "@jimp/core": "^0.8.4", + "@jimp/core": "^0.8.5", "core-js": "^2.5.7" } }, "@jimp/gif": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@jimp/gif/-/gif-0.8.4.tgz", - "integrity": "sha512-YpHZ7aWzmrviY7YigXRolHs6oBhGJItRry8fh3zebAgKth06GMv58ce84yXXOKX4yQ+QGd6GgOWzePx+KMP9TA==", + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/@jimp/gif/-/gif-0.8.5.tgz", + "integrity": "sha512-Mj8jmv4AS76OY+Hx/Xoyihj02SUZ2ELk+O5x89pODz1+NeGtSWHHjZjnSam9HYAjycvVI/lGJdk/7w0nWIV/yQ==", "requires": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7", "omggif": "^1.0.9" } }, "@jimp/jpeg": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.8.4.tgz", - "integrity": "sha512-7exKk3LNPKJgsFzUPL+mOJtIEHcLp6yU9sVbULffVDjVUun6/Are2tCX8rCXZq28yiUhofzr61k5UqjkKFJXrA==", + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.8.5.tgz", + "integrity": "sha512-7kjTY0BiCpwRywk+oPfpLto7cLI+9G0mf4N1bv1Hn+VLQwcXFy2fHyl4qjqLbbY6u4cyZgqN+R8Pg6GRRzv0kw==", "requires": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7", "jpeg-js": "^0.3.4" } }, "@jimp/plugin-blit": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.8.4.tgz", - "integrity": "sha512-H9bpetmOUgEHpkDSRzbXLMXQhr34i8YicYV3EDeuHU8mKlAjtMbVpbp5ZN4mcadTz+EYdTdVNfQNsRCcIb5Oeg==", + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.8.5.tgz", + "integrity": "sha512-r8Z1CwazaJwZCRbucQgrfprlGyH91tX7GubUsbWr+zy5/dRJAAgaPj/hcoHDwbh3zyiXp5BECKKzKW0x4reL4w==", "requires": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" } }, "@jimp/plugin-blur": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.8.4.tgz", - "integrity": "sha512-gvEDWW7+MI9Hk1KKzuFliRdDPaofkxB4pRJ/n1hipDoOGcNYFqxx5FGNQ4wsGSDpQ+RiHZF+JGKKb+EIwHg+0Q==", + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.8.5.tgz", + "integrity": "sha512-UH5ywpV4YooUh9HXEsrNKDtojLCvIAAV0gywqn8EQeFyzwBJyXAvRNARJp7zr5OPLr9uGXkRLDCO9YyzdlXZng==", "requires": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" } }, "@jimp/plugin-color": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.8.4.tgz", - "integrity": "sha512-DHCGMxInCI1coXMIfdZJ5G/4hpt5yZLNB5+oUIxT4aClzyhUjqD4xOcnO7hlPY6LuX8+FX7cYMHhdMfhTXB3Dg==", + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.8.5.tgz", + "integrity": "sha512-7XHqcTQ8Y1zto1b9P1y8m1dzSjnOpBsD9OZG0beTpeJ5bgPX+hF5ZLmvcM6c5ljkINw5EUF1it07BYbkCxiGQA==", "requires": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7", "tinycolor2": "^1.4.1" } }, "@jimp/plugin-contain": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.8.4.tgz", - "integrity": "sha512-3wwLXig5LkOMg5FrNZrX/r99ehaA+0s3dkro3CiRg0Ez6Y0fz067so+HdsmqmoG78WY/dCdgdps/xLOW2VV4DQ==", + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.8.5.tgz", + "integrity": "sha512-ZkiPFx9L0yITiKtYTYLWyBsSIdxo/NARhNPRZXyVF9HmTWSLDUw1c2c1uvETKxDZTAVK+souYT14DwFWWdhsYA==", "requires": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" } }, "@jimp/plugin-cover": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.8.4.tgz", - "integrity": "sha512-U0xmSfGLmw0Ieiw00CM8DQ+XoQVBxbjsLE5To8EejnyLx5X+oNZ8r7E5EsQaushUlzij95IqMCloo+nCGhdYMw==", + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.8.5.tgz", + "integrity": "sha512-OdT4YAopLOhbhTUQV3R1v5ZZqIaUt3n3vJi/OfTbsak1t9UkPBVdmYPyhoont8zJdtdkF5dW16Ro1FTshytcww==", "requires": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" } }, "@jimp/plugin-crop": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.8.4.tgz", - "integrity": "sha512-Neqs0K4cr7SU9nSte2qvGVh/8+K9ArH8mH1fWhZw4Zq8qD9NicX+g5hqmpmeSjOKD73t/jOmwvBevfJDu2KKSA==", + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.8.5.tgz", + "integrity": "sha512-E1Hb+gfu2k74Gkqh96apAyVljsP5MjCH4TY6lECAAEcYKGH/XRhz6lY2dSEjCYE7KtiqjTZzWwYkgAvkwojj9Q==", "requires": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" } }, "@jimp/plugin-displace": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.8.4.tgz", - "integrity": "sha512-qKCwAP2lAO3R8ofYaEF/Gh+sfcjzZLtEiYHzjx/mYvPpXS6Yvkvl28aUH8pwdJYT+QYGelHmOne0RJvjsac1NQ==", + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.8.5.tgz", + "integrity": "sha512-fVgVYTS1HZzAXkg8Lg06PuirSUG5oXYaYYGL+3ZU4tmZn1pyZ+mZyfejpwtymETEYZnmymHoCT4xto19E/IRvA==", "requires": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" } }, "@jimp/plugin-dither": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.8.4.tgz", - "integrity": "sha512-19+y5VAO6d0keRne9eJCdOeB9X0LFuRdRSjgwl/57JtREeoPj+iKBg6REBl4atiSGd7/UCFg3wRtFOw24XFKgw==", + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.8.5.tgz", + "integrity": "sha512-KSj2y8E3yK7tldjT/8ejqAWw5HFBjtWW6QkcxfW7FdV4c/nsXZXDkMbhqMZ7FkDuSYoAPeWUFeddrH4yipC5iA==", "requires": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" } }, "@jimp/plugin-flip": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.8.4.tgz", - "integrity": "sha512-1BtKtc8cANuGgiWyOmltQZaR3Y5Og/GS/db8wBpFNLJ33Ir5UAGN2raDtx4EYEd5okuRVFj3OP+wAZl69m72LQ==", + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.8.5.tgz", + "integrity": "sha512-2QbGDkurPNAXZUeHLo/UA3tjh+AbAXWZKSdtoa1ArlASovRz8rqtA45YIRIkKrMH82TA3PZk8bgP2jaLKLrzww==", "requires": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" } }, "@jimp/plugin-gaussian": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.8.4.tgz", - "integrity": "sha512-qYcVmiJn8l8uDZqk4FlB/qTV8fJgiJAh/xc/WKNEp2E8qFEgxoIPeimPHO8cJorEHqlh8I8l24OZkTkkEKaFfw==", + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.8.5.tgz", + "integrity": "sha512-2zReC5GJcVAXtf3UgzFcHSYN277i02K9Yrhc1xJf3mti00s43uD++B5Ho7/mIo+HrntVvWhxqar7PARdq0lVIg==", "requires": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" } }, "@jimp/plugin-invert": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.8.4.tgz", - "integrity": "sha512-OQ/dFDbBUmEd935Gitl5Pmgz+nLVyszwS0RqL6+G1U9EHYBeiHDrmY2sj7NgDjDEJYlRLxGlBRsTIPHzF3tdNw==", + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.8.5.tgz", + "integrity": "sha512-GyMXPGheHdS14xfDceuZ9hrGm6gE9UG3PfTEjQbJmHMWippLC6yf8kombSudJlUf8q72YYSSXsSFKGgkHa67vA==", "requires": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" } }, "@jimp/plugin-mask": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.8.4.tgz", - "integrity": "sha512-uqLdRGShHwCd9RHv8bMntTfDNDI2pcEeE7+F868P6PngWLKrzQCpuAyTnK6WK0ZN95fSsgy7TzCoesYk+FchkQ==", + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.8.5.tgz", + "integrity": "sha512-inD/++XO+MkmwXl9JGYQ8X2deyOZuq9i+dmugH/557p16B9Q6tvUQt5X1Yg5w7hhkLZ00BKOAJI9XoyCC1NFvQ==", "requires": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" } }, "@jimp/plugin-normalize": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.8.4.tgz", - "integrity": "sha512-+ihgQeVD8syWxw12F5ngUUdtlIcGDqH7hEoHcwVVGOFfaJqR4YBQR4FM3QLFFFdi2X/uK2nGJt9cMh0UaINEgw==", + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.8.5.tgz", + "integrity": "sha512-8YRWJWBT4NoSAbPhnjQJXGeaeWVrJAlGDv39A54oNH8Ry47fHcE0EN6zogQNpBuM34M6hRnZl4rOv1FIisaWdg==", "requires": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" } }, "@jimp/plugin-print": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.8.4.tgz", - "integrity": "sha512-Wg5tZI3hW5DG9Caz4wg4ZolS3Lvv4MFAxORPAeWeahDpHs38XZ7ydJ0KR39p2oWJPP0yIFv1fETYpU7BiJPRRw==", + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.8.5.tgz", + "integrity": "sha512-BviNpCiA/fEieOqsrWr1FkqyFuiG2izdyyg7zUqyeUTHPwqrTLvXO9cfP/ThG4hZpu5wMQ5QClWSqhZu1fAwxA==", "requires": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7", "load-bmfont": "^1.4.0" } }, "@jimp/plugin-resize": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.8.4.tgz", - "integrity": "sha512-z9tumvsQja/YFTSeGvofYLvVws8LZYLYVW8l17hBETzfZQdVEvPOdWKkXqsAsK5uY9m8M5rH7kR8NZbCDVbyzA==", + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.8.5.tgz", + "integrity": "sha512-gIdmISuNmZQ1QwprnRC5VXVWQfKIiWineVQGebpMAG/aoFOLDXrVl939Irg7Fb/uOlSFTzpAbt1zpJ8YG/Mi2w==", "requires": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" } }, "@jimp/plugin-rotate": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.8.4.tgz", - "integrity": "sha512-PVxpt3DjqaUnHP6Nd3tzZjl4SYe/FYXszGTshtx51AMuvZLnpvekrrclYyc7Dc1Ry3kx3ma6UuLCvmf85hrdmw==", + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.8.5.tgz", + "integrity": "sha512-8T9wnL3gb+Z0ogMZmtyI6h3y7TuqW2a5SpFbzFUVF+lTZoAabXjEfX3CAozizCLaT+Duc5H2FJVemAHiyr+Dbw==", "requires": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" } }, "@jimp/plugin-scale": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.8.4.tgz", - "integrity": "sha512-PrBTOMJ5n4gbIvRNxWfc1MdgHw4vd5r1UOHRVuc6ZQ9Z/FueBuvIidnz7GBRHbsRm3IjckvsLfEL1nIK0Kqh3A==", + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.8.5.tgz", + "integrity": "sha512-G+CDH9s7BsxJ4b+mKZ5SsiXwTAynBJ+7/9SwZFnICZJJvLd79Tws6VPXfSaKJZuWnGIX++L8jTGmFORCfLNkdg==", "requires": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" } }, "@jimp/plugins": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.8.4.tgz", - "integrity": "sha512-Vd0oCe0bj7c+crHL6ee178q2c1o50UnbCmc0imHYg7M+pY8S1kl4ubZWwkAg2W96FCarGrm9eqPvCUyAdFOi9w==", + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.8.5.tgz", + "integrity": "sha512-52na0wqfQ3uItIA+C9cJ1EXffhSmABgK7ETClDseUh9oGtynHzxZ97smnFf1ydLjXLrF89Gt+YBxWLyiBGgiZQ==", "requires": { - "@jimp/plugin-blit": "^0.8.4", - "@jimp/plugin-blur": "^0.8.4", - "@jimp/plugin-color": "^0.8.4", - "@jimp/plugin-contain": "^0.8.4", - "@jimp/plugin-cover": "^0.8.4", - "@jimp/plugin-crop": "^0.8.4", - "@jimp/plugin-displace": "^0.8.4", - "@jimp/plugin-dither": "^0.8.4", - "@jimp/plugin-flip": "^0.8.4", - "@jimp/plugin-gaussian": "^0.8.4", - "@jimp/plugin-invert": "^0.8.4", - "@jimp/plugin-mask": "^0.8.4", - "@jimp/plugin-normalize": "^0.8.4", - "@jimp/plugin-print": "^0.8.4", - "@jimp/plugin-resize": "^0.8.4", - "@jimp/plugin-rotate": "^0.8.4", - "@jimp/plugin-scale": "^0.8.4", + "@jimp/plugin-blit": "^0.8.5", + "@jimp/plugin-blur": "^0.8.5", + "@jimp/plugin-color": "^0.8.5", + "@jimp/plugin-contain": "^0.8.5", + "@jimp/plugin-cover": "^0.8.5", + "@jimp/plugin-crop": "^0.8.5", + "@jimp/plugin-displace": "^0.8.5", + "@jimp/plugin-dither": "^0.8.5", + "@jimp/plugin-flip": "^0.8.5", + "@jimp/plugin-gaussian": "^0.8.5", + "@jimp/plugin-invert": "^0.8.5", + "@jimp/plugin-mask": "^0.8.5", + "@jimp/plugin-normalize": "^0.8.5", + "@jimp/plugin-print": "^0.8.5", + "@jimp/plugin-resize": "^0.8.5", + "@jimp/plugin-rotate": "^0.8.5", + "@jimp/plugin-scale": "^0.8.5", "core-js": "^2.5.7", "timm": "^1.6.1" } }, "@jimp/png": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@jimp/png/-/png-0.8.4.tgz", - "integrity": "sha512-DLj260SwQr9ZNhSto1BacXGNRhIQiLNOESPoq5DGjbqiPCmYNxE7CPlXB1BVh0T3AmZBjnZkZORU0Y9wTi3gJw==", + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/@jimp/png/-/png-0.8.5.tgz", + "integrity": "sha512-zT89ucu8I2rsD3FIMIPLgr1OyKn4neD+5umwD3MY8AOB8+6tX5bFtnmTm3FzGJaJuibkK0wFl87eiaxnb+Megw==", "requires": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7", "pngjs": "^3.3.3" } }, "@jimp/tiff": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.8.4.tgz", - "integrity": "sha512-SQmf1B/TbCtbwzJReLw/lzGqbeu8MOfT+wkaia0XWS72H6bEW66PTQKhB4/3uzC/Xnmsep1WNQITlwcWdgc36Q==", + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.8.5.tgz", + "integrity": "sha512-Z7uzDcbHuwDg+hy2+UJQ2s5O6sqYXmv6H1fmSf/2dxBrlGMzl8yTc2/BxLrGREeoidDDMcKmXYGAOp4uCsdJjw==", "requires": { "core-js": "^2.5.7", "utif": "^2.0.1" } }, "@jimp/types": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@jimp/types/-/types-0.8.4.tgz", - "integrity": "sha512-BCehQ5hrTOGDGdeROwXOYqgFGAzJPkuXmVJXgMgBoW1YjoGWhXJ5iShaJ/l7DRErrdezoWUdAhTFlV5bJf51dg==", + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/@jimp/types/-/types-0.8.5.tgz", + "integrity": "sha512-XUvpyebZGd1vyFiJyxUT4H9A3mKD7MV2MxjXnay3fNTrcow0UJJspmFw/w+G3TP/1dgrVC4K++gntjR6QWTzvg==", "requires": { - "@jimp/bmp": "^0.8.4", - "@jimp/gif": "^0.8.4", - "@jimp/jpeg": "^0.8.4", - "@jimp/png": "^0.8.4", - "@jimp/tiff": "^0.8.4", + "@jimp/bmp": "^0.8.5", + "@jimp/gif": "^0.8.5", + "@jimp/jpeg": "^0.8.5", + "@jimp/png": "^0.8.5", + "@jimp/tiff": "^0.8.5", "core-js": "^2.5.7", "timm": "^1.6.1" } }, "@jimp/utils": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@jimp/utils/-/utils-0.8.4.tgz", - "integrity": "sha512-6Cwplao7IgwhFRijMvvyjdV7Sa7Fw71vS1aDsUDCVpi3XHsiLUM+nPTno6OKjzg2z2EufuolWPEvuq/GSte4lA==", + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/@jimp/utils/-/utils-0.8.5.tgz", + "integrity": "sha512-D3+H4BiopDkhUKvKkZTPPJ53voqOkfMuk3r7YZNcLtXGLkchjjukC4056lNo7B0DzjBgowTYsQM3JjKnYNIYeg==", "requires": { "core-js": "^2.5.7" } @@ -2219,9 +2219,9 @@ } }, "core-js": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz", - "integrity": "sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==" + "version": "2.6.10", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.10.tgz", + "integrity": "sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==" }, "core-util-is": { "version": "1.0.2", @@ -7004,13 +7004,13 @@ } }, "jimp": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/jimp/-/jimp-0.8.4.tgz", - "integrity": "sha512-xCPvd2HIH8iR7+gWVnivzXwiQGnLBmLDpaEj5M0vQf3uur5MuLCOWbBduAdk6r3ur8X0kwgM4eEM0i7o+k9x9g==", + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/jimp/-/jimp-0.8.5.tgz", + "integrity": "sha512-BW7t/+TCgKpqZw/wHFwqF/A/Tyk43RmzRHyMBdqfOepqunUrajt0RTqowdWyFo4CS2FmD8pFiYfefWjpXFWrCA==", "requires": { - "@jimp/custom": "^0.8.4", - "@jimp/plugins": "^0.8.4", - "@jimp/types": "^0.8.4", + "@jimp/custom": "^0.8.5", + "@jimp/plugins": "^0.8.5", + "@jimp/types": "^0.8.5", "core-js": "^2.5.7", "regenerator-runtime": "^0.13.3" } diff --git a/package.json b/package.json index ce079afcd..d304752d5 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "imagemin-mozjpeg": "8.0.0", "imagemin-pngquant": "8.0.0", "ini": "1.3.5", - "jimp": "0.8.4", + "jimp": "0.8.5", "mime-types": "2.1.24", "moment": "2.24.0", "multer": "1.4.2", diff --git a/src/public/javascripts/services/frontend_script_api.js b/src/public/javascripts/services/frontend_script_api.js index f2fc3fb9b..95f6d9532 100644 --- a/src/public/javascripts/services/frontend_script_api.js +++ b/src/public/javascripts/services/frontend_script_api.js @@ -142,6 +142,8 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte currentNoteId: currentNote.noteId, originEntityName: "notes", // currently there's no other entity on frontend which can trigger event originEntityId: originEntity ? originEntity.noteId : null + }, { + 'trilium-source-id': "script" }); if (ret.success) { diff --git a/src/public/javascripts/services/server.js b/src/public/javascripts/services/server.js index a8afa62d8..3ab8a118c 100644 --- a/src/public/javascripts/services/server.js +++ b/src/public/javascripts/services/server.js @@ -3,43 +3,46 @@ import infoService from "./info.js"; const REQUEST_LOGGING_ENABLED = false; -function getHeaders() { +function getHeaders(headers) { // headers need to be lowercase because node.js automatically converts them to lower case // so hypothetical protectedSessionId becomes protectedsessionid on the backend // also avoiding using underscores instead of dashes since nginx filters them out by default - const headers = { - 'trilium-source-id': glob.sourceId, - 'x-csrf-token': glob.csrfToken + const allHeaders = { + ...{ + 'trilium-source-id': glob.sourceId, + 'x-csrf-token': glob.csrfToken + }, + ...headers }; if (utils.isElectron()) { // passing it explicitely here because of the electron HTTP bypass - headers.cookie = document.cookie; + allHeaders.cookie = document.cookie; } - return headers; + return allHeaders; } -async function get(url) { - return await call('GET', url); +async function get(url, headers = {}) { + return await call('GET', url, null, headers); } -async function post(url, data) { - return await call('POST', url, data); +async function post(url, data, headers = {}) { + return await call('POST', url, data, headers); } -async function put(url, data) { - return await call('PUT', url, data); +async function put(url, data, headers = {}) { + return await call('PUT', url, data, headers); } -async function remove(url) { - return await call('DELETE', url); +async function remove(url, headers = {}) { + return await call('DELETE', url, null, headers); } let i = 1; const reqResolves = {}; -async function call(method, url, data) { +async function call(method, url, data, headers = {}) { if (utils.isElectron()) { const ipc = require('electron').ipcRenderer; const requestId = i++; @@ -53,7 +56,7 @@ async function call(method, url, data) { ipc.send('server-request', { requestId: requestId, - headers: getHeaders(), + headers: getHeaders(headers), method: method, url: "/" + baseApiUrl + url, data: data diff --git a/src/public/stylesheets/style.css b/src/public/stylesheets/style.css index 9b1a9c316..871196ffa 100644 --- a/src/public/stylesheets/style.css +++ b/src/public/stylesheets/style.css @@ -167,7 +167,7 @@ span.fancytree-title { } span.fancytree-node.protected > span.fancytree-custom-icon { - filter: drop-shadow(2px 2px 2px black); + filter: drop-shadow(2px 2px 2px var(--main-text-color)); } span.fancytree-node.multiple-parents .fancytree-title::after { @@ -863,7 +863,7 @@ a.external:not(.no-arrow):after, a[href^="http://"]:not(.no-arrow):after, a[href position: absolute; width: 100%; top: 20px; - z-index: 10000; + z-index: -100; } .toast { diff --git a/src/services/script.js b/src/services/script.js index 8fbfd8828..5a3949d0b 100644 --- a/src/services/script.js +++ b/src/services/script.js @@ -32,6 +32,8 @@ async function executeBundle(bundle, apiParams = {}) { apiParams.startNote = bundle.note; } + cls.namespace.set('sourceId', 'script'); + // last \r\n is necessary if script contains line comment on its last line const script = "async function() {\r\n" + bundle.script + "\r\n}";