diff --git a/package-lock.json b/package-lock.json index 96cfe8114..a01219d42 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1347,9 +1347,9 @@ "dev": true }, "bmp-js": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/bmp-js/-/bmp-js-0.0.3.tgz", - "integrity": "sha1-ZBE+nHzxICs3btYHvzBibr5XsYo=", + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/bmp-js/-/bmp-js-0.1.0.tgz", + "integrity": "sha1-4Fpj95amwf8l9Hcex62twUjAcjM=", "dev": true }, "boolbase": { @@ -3408,9 +3408,9 @@ } }, "file-type": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", - "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=", + "version": "12.3.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-12.3.0.tgz", + "integrity": "sha512-4E4Esq9KLwjYCY32E7qSmd0h7LefcniZHX+XcdJ4Wfx1uGJX7QCigiqw/U0yT7WOslm28yhxl87DJ0wHYv0RAA==", "dev": true }, "file-uri-to-path": { @@ -4273,16 +4273,6 @@ "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", "dev": true }, - "get-stream": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz", - "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=", - "dev": true, - "requires": { - "object-assign": "^4.0.1", - "pinkie-promise": "^2.0.0" - } - }, "get-uri": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-2.0.3.tgz", @@ -6359,61 +6349,341 @@ } }, "jimp": { - "version": "0.2.28", - "resolved": "https://registry.npmjs.org/jimp/-/jimp-0.2.28.tgz", - "integrity": "sha1-3VKak3GQ9ClXp5N9Gsw6d2KZbqI=", - "dev": true, - "requires": { - "bignumber.js": "^2.1.0", - "bmp-js": "0.0.3", - "es6-promise": "^3.0.2", - "exif-parser": "^0.1.9", - "file-type": "^3.1.0", - "jpeg-js": "^0.2.0", - "load-bmfont": "^1.2.3", - "mime": "^1.3.4", - "mkdirp": "0.5.1", - "pixelmatch": "^4.0.0", - "pngjs": "^3.0.0", - "read-chunk": "^1.0.1", - "request": "^2.65.0", - "stream-to-buffer": "^0.1.0", - "tinycolor2": "^1.1.2", - "url-regex": "^3.0.0" + "version": "0.8.4", + "resolved": "https://registry.npmjs.org/jimp/-/jimp-0.8.4.tgz", + "integrity": "sha512-xCPvd2HIH8iR7+gWVnivzXwiQGnLBmLDpaEj5M0vQf3uur5MuLCOWbBduAdk6r3ur8X0kwgM4eEM0i7o+k9x9g==", + "dev": true, + "requires": { + "@jimp/custom": "^0.8.4", + "@jimp/plugins": "^0.8.4", + "@jimp/types": "^0.8.4", + "core-js": "^2.5.7", + "regenerator-runtime": "^0.13.3" }, "dependencies": { - "bignumber.js": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-2.4.0.tgz", - "integrity": "sha1-g4qZLan51zfg9LLbC+YrsJ3Qxeg=", - "dev": true + "@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==", + "dev": true, + "requires": { + "@jimp/utils": "^0.8.4", + "bmp-js": "^0.1.0", + "core-js": "^2.5.7" + } }, - "es6-promise": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz", - "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=", - "dev": true + "@jimp/core": { + "version": "0.8.4", + "resolved": "https://registry.npmjs.org/@jimp/core/-/core-0.8.4.tgz", + "integrity": "sha512-3fK5UEOEQsfSDhsrAgBT6W8Up51qkeCj9RVjusxUaEGmix34PO/KTVfzURlu6NOpOUvtfNXsCq9xS7cxBTWSCA==", + "dev": true, + "requires": { + "@jimp/utils": "^0.8.4", + "any-base": "^1.1.0", + "buffer": "^5.2.0", + "core-js": "^2.5.7", + "exif-parser": "^0.1.12", + "file-type": "^9.0.0", + "load-bmfont": "^1.3.1", + "mkdirp": "0.5.1", + "phin": "^2.9.1", + "pixelmatch": "^4.0.2", + "tinycolor2": "^1.4.1" + } }, - "ip-regex": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-1.0.3.tgz", - "integrity": "sha1-3FiQdvZZ9BnCIgOaMzFvHHOH7/0=", - "dev": true + "@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==", + "dev": true, + "requires": { + "@jimp/core": "^0.8.4", + "core-js": "^2.5.7" + } }, - "jpeg-js": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.2.0.tgz", - "integrity": "sha1-U+RI7J0mPmgyZkZ+lELSxaLvVII=", - "dev": true + "@jimp/gif": { + "version": "0.8.4", + "resolved": "https://registry.npmjs.org/@jimp/gif/-/gif-0.8.4.tgz", + "integrity": "sha512-YpHZ7aWzmrviY7YigXRolHs6oBhGJItRry8fh3zebAgKth06GMv58ce84yXXOKX4yQ+QGd6GgOWzePx+KMP9TA==", + "dev": true, + "requires": { + "@jimp/utils": "^0.8.4", + "core-js": "^2.5.7", + "omggif": "^1.0.9" + } }, - "url-regex": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/url-regex/-/url-regex-3.2.0.tgz", - "integrity": "sha1-260eDJ4p4QXdCx8J9oYvf9tIJyQ=", + "@jimp/jpeg": { + "version": "0.8.4", + "resolved": "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.8.4.tgz", + "integrity": "sha512-7exKk3LNPKJgsFzUPL+mOJtIEHcLp6yU9sVbULffVDjVUun6/Are2tCX8rCXZq28yiUhofzr61k5UqjkKFJXrA==", + "dev": true, + "requires": { + "@jimp/utils": "^0.8.4", + "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==", + "dev": true, + "requires": { + "@jimp/utils": "^0.8.4", + "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==", + "dev": true, + "requires": { + "@jimp/utils": "^0.8.4", + "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==", + "dev": true, + "requires": { + "@jimp/utils": "^0.8.4", + "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==", + "dev": true, + "requires": { + "@jimp/utils": "^0.8.4", + "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==", + "dev": true, + "requires": { + "@jimp/utils": "^0.8.4", + "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==", + "dev": true, + "requires": { + "@jimp/utils": "^0.8.4", + "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==", + "dev": true, + "requires": { + "@jimp/utils": "^0.8.4", + "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==", + "dev": true, + "requires": { + "@jimp/utils": "^0.8.4", + "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==", + "dev": true, + "requires": { + "@jimp/utils": "^0.8.4", + "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==", + "dev": true, + "requires": { + "@jimp/utils": "^0.8.4", + "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==", + "dev": true, + "requires": { + "@jimp/utils": "^0.8.4", + "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==", + "dev": true, + "requires": { + "@jimp/utils": "^0.8.4", + "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==", + "dev": true, + "requires": { + "@jimp/utils": "^0.8.4", + "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==", + "dev": true, + "requires": { + "@jimp/utils": "^0.8.4", + "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==", + "dev": true, + "requires": { + "@jimp/utils": "^0.8.4", + "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==", + "dev": true, + "requires": { + "@jimp/utils": "^0.8.4", + "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==", + "dev": true, + "requires": { + "@jimp/utils": "^0.8.4", + "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==", "dev": true, "requires": { - "ip-regex": "^1.0.1" + "@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", + "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==", + "dev": true, + "requires": { + "@jimp/utils": "^0.8.4", + "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==", + "dev": true, + "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==", + "dev": true, + "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", + "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==", + "dev": true, + "requires": { + "core-js": "^2.5.7" + } + }, + "core-js": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz", + "integrity": "sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==", + "dev": true + }, + "file-type": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-9.0.0.tgz", + "integrity": "sha512-Qe/5NJrgIOlwijpq3B7BEpzPFcgzggOTagZmkXQY4LA6bsXKTUstK7Wp12lEJ/mLKTpvIZxmIuRcLYWT6ov9lw==", + "dev": true + }, + "regenerator-runtime": { + "version": "0.13.3", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz", + "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==", + "dev": true } } }, @@ -8398,12 +8668,6 @@ } } }, - "read-chunk": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-chunk/-/read-chunk-1.0.1.tgz", - "integrity": "sha1-X2jKswfmY/GZk1J9m1icrORmEZQ=", - "dev": true - }, "read-pkg": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", @@ -8649,31 +8913,13 @@ } }, "resize-img": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/resize-img/-/resize-img-1.1.2.tgz", - "integrity": "sha1-+tZQ+vPvLFPqYxErwnLZXp2SVQ4=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/resize-img/-/resize-img-2.0.0.tgz", + "integrity": "sha512-im2Kn4CY0c7JGdYXwL7g77T8AUi15YQeEBmmpWuglrcPFq4Di53tIvLXlbasW7UKed9GaZCza/OSxOJrmB0jbg==", "dev": true, "requires": { - "bmp-js": "0.0.1", - "file-type": "^3.8.0", - "get-stream": "^2.0.0", - "jimp": "^0.2.21", - "jpeg-js": "^0.1.1", - "parse-png": "^1.1.1" - }, - "dependencies": { - "bmp-js": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/bmp-js/-/bmp-js-0.0.1.tgz", - "integrity": "sha1-WtAUcJnROp84qnuZrx1ueGZu038=", - "dev": true - }, - "jpeg-js": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.1.2.tgz", - "integrity": "sha1-E1uZLAV1yYXPoPSUoyJ+0jhYPs4=", - "dev": true - } + "file-type": "^12.3.0", + "jimp": "^0.8.3" } }, "resolve": { @@ -10382,8 +10628,7 @@ "arrify": "^1.0.1", "buffer-alloc": "^1.1.0", "image-size": "^0.5.0", - "parse-png": "^1.0.0", - "resize-img": "^1.1.0" + "parse-png": "^1.0.0" }, "dependencies": { "image-size": { diff --git a/package.json b/package.json index 9af8302fa..36fdf5f42 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "parse-png": "1.1.2", "pixelmatch": "4.0.2", "pngjs": "3.4.0", - "resize-img": "1.1.2", + "resize-img": "2.0.0", "serve": "11.0.0", "sitemap": "2.2.0", "stream-to-buffer": "0.1.0",