Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
Replace sharp with image-size (#2303)
Bogdan Chadkin0784f0465d6a
diff --git a/packages/asset-uploader/package.json b/packages/asset-uploader/package.jsonindex edec16e63e..ee6a090e1b 100644--- a/packages/asset-uploader/package.json+++ b/packages/asset-uploader/package.json@@ -21,16 +21,15 @@"@webstudio-is/sdk": "workspace:^","@webstudio-is/trpc-interface": "workspace:^","fontkit": "^2.0.2",+ "image-size": "^1.0.2","immer": "^10.0.2","nanoid": "^4.0.2",- "sharp": "^0.30.7","warn-once": "^0.1.1"},"devDependencies": {"@jest/globals": "^29.6.4","@types/fontkit": "^2.0.3","@types/node": "^18.11.18",- "@types/sharp": "^0.30.4","@webstudio-is/jest-config": "workspace:^","@webstudio-is/tsconfig": "workspace:^","jest": "^29.6.4",diff --git a/packages/asset-uploader/src/utils/get-asset-data.ts b/packages/asset-uploader/src/utils/get-asset-data.tsindex b383ef8bd6..7d6aa289fc 100644--- a/packages/asset-uploader/src/utils/get-asset-data.ts+++ b/packages/asset-uploader/src/utils/get-asset-data.ts@@ -1,5 +1,5 @@import { z } from "zod";-import sharp from "sharp";+import { imageSize } from "image-size";import { FontMeta } from "@webstudio-is/fonts";import { ImageMeta } from "@webstudio-is/sdk";import { getFontData } from "./font-data";@@ -27,15 +27,24 @@ export const getAssetData = async (options: AssetOptions): Promise<AssetData> => {if (options.type === "image") {- const sharpImage = sharp(options.data);- const { width, height, format } = await sharpImage.metadata();- if (format === undefined) {- throw new Error("Unknown image format");+ let image: undefined | { format: string; width: number; height: number };+ try {+ const parsed = imageSize(Buffer.from(options.data));+ if (parsed.type && parsed.width && parsed.height) {+ image = {+ format: parsed.type,+ width: parsed.width,+ height: parsed.height,+ };+ }+ } catch {+ // empty block}- if (width === undefined || height === undefined) {- throw new Error("Unknown image dimensions");+ if (image === undefined) {+ throw new Error("Unknown image format");}+ const { format, width, height } = image;return {size: options.size,format,diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex e4bb80fbf2..5de7fa21fa 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -452,15 +452,15 @@ importers:fontkit:specifier: ^2.0.2version: 2.0.2+ image-size:+ specifier: ^1.0.2+ version: 1.0.2immer:specifier: ^10.0.2version: 10.0.2nanoid:specifier: ^4.0.2version: 4.0.2- sharp:- specifier: ^0.30.7- version: 0.30.7warn-once:specifier: ^0.1.1version: 0.1.1@@ -474,9 +474,6 @@ importers:'@types/node':specifier: ^18.11.18version: 18.13.0- '@types/sharp':- specifier: ^0.30.4- version: 0.30.4'@webstudio-is/jest-config':specifier: workspace:^version: link:../jest-config@@ -7603,12 +7600,6 @@ packages:'@types/mime': 3.0.1'@types/node': 18.17.1- /@types/[email protected]:- resolution: {integrity: sha512-6oJEzKt7wZeS7e+6x9QFEOWGs0T/6of00+0onZGN1zSmcSjcTDZKgIGZ6YWJnHowpaKUCFBPH52mYljWqU32Eg==}- dependencies:- '@types/node': 18.17.1- dev: true-/@types/[email protected]:resolution: {integrity: sha512-TgfOX+mGY/NyNxJLIbDWrO9DjGoVSW9+aB8H2yy1fy32jsvxijhmyJI9fDFgvz3YP4lvJaq9DzdR/M1bOgVc9g==}dev: true@@ -8780,26 +8771,11 @@ packages:resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}- resolution: {integrity: sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==}- dependencies:- color-name: 1.1.4- simple-swizzle: 0.2.2- dev: false-resolution: {integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==}hasBin: truedev: false- resolution: {integrity: sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==}- engines: {node: '>=12.5.0'}- dependencies:- color-convert: 2.0.1- color-string: 1.9.1- dev: false-resolution: {integrity: sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==}dev: false@@ -9083,6 +9059,7 @@ packages:engines: {node: '>=10'}dependencies:mimic-response: 3.1.0+ dev: trueresolution: {integrity: sha512-7glNLfvdsMzZm3FpRY1CHuI2lbYDR+71YmrhmTZjYFD5pfT0ACgnGRdrrC9Mk2uICnzkcdelCx5at787UDGOvg==}@@ -9092,11 +9069,6 @@ packages:babel-plugin-macros:optional: true- resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}- engines: {node: '>=4.0.0'}- dev: false-resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}@@ -9191,11 +9163,6 @@ packages:resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==}engines: {node: '>=8'}- resolution: {integrity: sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==}- engines: {node: '>=8'}- dev: false-resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==}engines: {node: '>=8'}@@ -10022,11 +9989,6 @@ packages:resolution: {integrity: sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==}engines: {node: '>= 0.8.0'}- resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==}- engines: {node: '>=6'}- dev: false-resolution: {integrity: sha512-F2W2UyQ8XYyftHT57dtfg8Ue3X5qLgm2sSug0ivvLRH/VKNRL/pDxg/TH7zVzbQB0tu80clNFy6LU7OS/VSEKA==}engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}@@ -10522,10 +10484,6 @@ packages:resolution: {integrity: sha512-Y7wLWcrLUXwk2noSka166byGCvhMtDRpgHdzCno1UQv/n/Hegp++a2xBWJL1lJarnKD3SWaljD+0z1ztqxuKyQ==}dev: true- resolution: {integrity: sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==}- dev: false-resolution: {integrity: sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ==}@@ -10884,6 +10842,14 @@ packages:resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==}engines: {node: '>= 4'}+ resolution: {integrity: sha512-xfOoWjceHntRb3qFCrh5ZFORYH8XCdYpASltMhZ/Q0KZiOwjdE/Yl2QCiWdwD+lygV5bMCvauzgu5PxBX/Yerg==}+ engines: {node: '>=14.0.0'}+ hasBin: true+ dependencies:+ queue: 6.0.2+ dev: false+resolution: {integrity: sha512-Rx3CqeqQ19sxUtYV9CU911Vhy8/721wRFnJv3REVGWUmoAcIwzifTsdmJte/MV+0/XpM35LZdQMBGkRIoLPwQA==}dev: false@@ -10931,10 +10897,6 @@ packages:resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}- resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}- dev: false-resolution: {integrity: sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==}dev: true@@ -11025,10 +10987,6 @@ packages:resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}- resolution: {integrity: sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==}- dev: false-resolution: {integrity: sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==}engines: {node: '>= 0.4'}@@ -13057,6 +13015,7 @@ packages:resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==}engines: {node: '>=10'}+ dev: trueresolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}@@ -13290,10 +13249,6 @@ packages:engines: {node: ^16.0.0 || ^18.0.0 || >=20.0.0}dev: false- resolution: {integrity: sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==}- dev: false-resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}@@ -13316,22 +13271,11 @@ packages:tslib: 2.6.0dev: false- resolution: {integrity: sha512-u4uAs/4Zzmp/jjsD9cyFYDXeISfUWaAVWshPmDZOFOv4Xl4SbzTXm53I04C2uRueYJ+0t5PEtLH/owbn2Npf/w==}- engines: {node: '>=10'}- dependencies:- semver: 7.5.4- dev: false-resolution: {integrity: sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==}dev: trueoptional: true- resolution: {integrity: sha512-CvkDw2OEnme7ybCykJpVcKH+uAOLV2qLqiyla128dN9TkEWfrYmxG6C2boDe5KcNQqZF3orkqzGgOMvZ/JNekA==}- dev: false-resolution: {integrity: sha512-tmPX422rYgofd4epzrNoOXiE8XFZYOcCq1vD7MAXCDO+O+zndlA2ztdKKMa+EeuBG5tHETpr4ml4RGgpqDCCAg==}engines: {node: '>= 0.10.5'}@@ -13993,25 +13937,6 @@ packages:picocolors: 1.0.0source-map-js: 1.0.2- resolution: {integrity: sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==}- engines: {node: '>=10'}- hasBin: true- dependencies:- detect-libc: 2.0.1- expand-template: 2.0.3- github-from-package: 0.0.0- minimist: 1.2.8- mkdirp-classic: 0.5.3- napi-build-utils: 1.0.2- node-abi: 3.22.0- pump: 3.0.0- rc: 1.2.8- simple-get: 4.0.1- tar-fs: 2.1.1- tunnel-agent: 0.6.0- dev: false-resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}engines: {node: '>= 0.8.0'}@@ -14183,6 +14108,12 @@ packages:resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}+ resolution: {integrity: sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==}+ dependencies:+ inherits: 2.0.4+ dev: false+resolution: {integrity: sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==}engines: {node: '>=10'}@@ -14204,16 +14135,6 @@ packages:iconv-lite: 0.4.24unpipe: 1.0.0- resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==}- hasBin: true- dependencies:- deep-extend: 0.6.0- ini: 1.3.8- minimist: 1.2.8- strip-json-comments: 2.0.1- dev: false-resolution: {integrity: sha512-LEeGE/ZzNLIsFWa1TMe8y5VYqr7bibneWmvJwm1pCn/eNmrabWDh659JSPn9BuaMpEfU83WTOJfnCcjDZwNQTA==}peerDependencies:@@ -15064,21 +14985,6 @@ packages:resolution: {integrity: sha512-pfVOw8QZIXpMbhBWvzBISicvToTiM5WBF1EeAUZDDSb5Dt29yl4AYbyywbJFSEsRUMr7gJaxqCdr4L3tQf9wVg==}dev: false- resolution: {integrity: sha512-G+MY2YW33jgflKPTXXptVO28HvNOo9G3j0MybYAHeEmby+QuD2U98dT6ueht9cv/XDqZspSpIhoSW+BAKJ7Hig==}- engines: {node: '>=12.13.0'}- requiresBuild: true- dependencies:- color: 4.2.3- detect-libc: 2.0.1- node-addon-api: 5.0.0- prebuild-install: 7.1.1- semver: 7.5.4- simple-get: 4.0.1- tar-fs: 2.1.1- tunnel-agent: 0.6.0- dev: false-resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}engines: {node: '>=8'}@@ -15103,30 +15009,12 @@ packages:resolution: {integrity: sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==}engines: {node: '>=14'}- resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==}- dev: false-- resolution: {integrity: sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==}- dependencies:- decompress-response: 6.0.0- once: 1.4.0- simple-concat: 1.0.1- dev: false-resolution: {integrity: sha512-waSQ5paUQtyGC0ZxlHmcMmD9I1rRXauikBwX31bX58l5vTOhCEcBC5Bi+ZDkPXTjDnZAF8TbCqKBY+9+sVPScw==}hasBin: truerequiresBuild: truedev: true- resolution: {integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==}- dependencies:- is-arrayish: 0.3.2- dev: false-resolution: {integrity: sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==}engines: {node: '>=10'}@@ -15475,11 +15363,6 @@ packages:min-indent: 1.0.1dev: false- resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==}- engines: {node: '>=0.10.0'}- dev: false-resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}engines: {node: '>=8'}@@ -15803,12 +15686,6 @@ packages:fsevents: 2.3.2dev: true- resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}- dependencies:- safe-buffer: 5.2.1- dev: false-resolution: {integrity: sha512-VlXkQR0TEBAEyBRsvAXBax+fj1EdPKPliwBaCnRLiDUcA/8wYlKte/Kk6ubmj9E0n7U/B4keCxxHiJZqW/5Rqg==}cpu: [x64]