From 8f02220ddfcb0d50e1805c3976eca53d9a6b69d6 Mon Sep 17 00:00:00 2001
From: Princesseuh <princssdev@gmail.com>
Date: Mon, 1 May 2023 14:44:58 +0200
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20fix=20sharp=20semver=20range=20to=20?=
 =?UTF-8?q?allow=20for=200.3=C3=A920?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .changeset/thick-frogs-call.md                |  6 ++
 packages/astro/package.json                   |  5 +-
 packages/integrations/image/package.json      |  5 +-
 .../background-color-image/package.json       |  2 +-
 .../test/fixtures/basic-image/package.json    |  2 +-
 .../test/fixtures/basic-picture/package.json  |  2 +-
 .../fixtures/get-image-remote/package.json    |  2 +-
 .../fixtures/no-alt-text-image/package.json   |  2 +-
 .../fixtures/no-alt-text-picture/package.json |  2 +-
 .../image/test/fixtures/rotation/package.json |  2 +-
 .../image/test/fixtures/with-mdx/package.json |  2 +-
 pnpm-lock.yaml                                | 98 ++++++++++---------
 12 files changed, 71 insertions(+), 59 deletions(-)
 create mode 100644 .changeset/thick-frogs-call.md

diff --git a/.changeset/thick-frogs-call.md b/.changeset/thick-frogs-call.md
new file mode 100644
index 000000000000..ce2cbcc70e55
--- /dev/null
+++ b/.changeset/thick-frogs-call.md
@@ -0,0 +1,6 @@
+---
+'@astrojs/image': patch
+'astro': patch
+---
+
+Update allowed Sharp versions to support 0.32.0
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 0c1cc0e322eb..a4ba857cb4c3 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -181,7 +181,6 @@
     "@types/rimraf": "^3.0.2",
     "@types/send": "^0.17.1",
     "@types/server-destroy": "^1.0.1",
-    "@types/sharp": "^0.31.1",
     "@types/unist": "^2.0.6",
     "astro-scripts": "workspace:*",
     "chai": "^4.3.6",
@@ -196,13 +195,13 @@
     "remark-code-titles": "^0.1.2",
     "rollup": "^3.9.0",
     "sass": "^1.52.2",
-    "sharp": "^0.31.3",
+    "sharp": "^0.32.1",
     "srcset-parse": "^1.1.0",
     "undici": "^5.22.0",
     "unified": "^10.1.2"
   },
   "peerDependencies": {
-    "sharp": "^0.31.3"
+    "sharp": ">=0.32.0"
   },
   "peerDependenciesMeta": {
     "sharp": {
diff --git a/packages/integrations/image/package.json b/packages/integrations/image/package.json
index 8f12944f8978..db8231b45339 100644
--- a/packages/integrations/image/package.json
+++ b/packages/integrations/image/package.json
@@ -51,7 +51,6 @@
   "devDependencies": {
     "@types/http-cache-semantics": "^4.0.1",
     "@types/mime": "^2.0.3",
-    "@types/sharp": "^0.30.5",
     "astro": "workspace:*",
     "astro-scripts": "workspace:*",
     "chai": "^4.3.6",
@@ -59,12 +58,12 @@
     "fast-glob": "^3.2.11",
     "mocha": "^9.2.2",
     "rollup-plugin-copy": "^3.4.0",
-    "sharp": "^0.31.0",
+    "sharp": "^0.32.1",
     "vite": "^4.3.1"
   },
   "peerDependencies": {
     "astro": "workspace:^2.3.2",
-    "sharp": ">=0.31.0"
+    "sharp": ">=0.32.0"
   },
   "peerDependenciesMeta": {
     "sharp": {
diff --git a/packages/integrations/image/test/fixtures/background-color-image/package.json b/packages/integrations/image/test/fixtures/background-color-image/package.json
index c94822bfcfd7..db45dae311d6 100644
--- a/packages/integrations/image/test/fixtures/background-color-image/package.json
+++ b/packages/integrations/image/test/fixtures/background-color-image/package.json
@@ -6,6 +6,6 @@
     "@astrojs/image": "workspace:*",
     "@astrojs/node": "workspace:*",
     "astro": "workspace:*",
-    "sharp": "^0.31.0"
+    "sharp": "^0.32.1"
   }
 }
diff --git a/packages/integrations/image/test/fixtures/basic-image/package.json b/packages/integrations/image/test/fixtures/basic-image/package.json
index 25ffbf831e72..4df1316ba0b1 100644
--- a/packages/integrations/image/test/fixtures/basic-image/package.json
+++ b/packages/integrations/image/test/fixtures/basic-image/package.json
@@ -6,6 +6,6 @@
     "@astrojs/image": "workspace:*",
     "@astrojs/node": "workspace:*",
     "astro": "workspace:*",
-    "sharp": "^0.31.0"
+    "sharp": "^0.32.1"
   }
 }
diff --git a/packages/integrations/image/test/fixtures/basic-picture/package.json b/packages/integrations/image/test/fixtures/basic-picture/package.json
index 4c84e318f81a..1949eb5a9ead 100644
--- a/packages/integrations/image/test/fixtures/basic-picture/package.json
+++ b/packages/integrations/image/test/fixtures/basic-picture/package.json
@@ -6,6 +6,6 @@
     "@astrojs/image": "workspace:*",
     "@astrojs/node": "workspace:*",
     "astro": "workspace:*",
-    "sharp": "^0.31.0"
+    "sharp": "^0.32.1"
   }
 }
diff --git a/packages/integrations/image/test/fixtures/get-image-remote/package.json b/packages/integrations/image/test/fixtures/get-image-remote/package.json
index a5279e31224a..83f0e02dea34 100644
--- a/packages/integrations/image/test/fixtures/get-image-remote/package.json
+++ b/packages/integrations/image/test/fixtures/get-image-remote/package.json
@@ -5,6 +5,6 @@
   "dependencies": {
     "@astrojs/image": "workspace:*",
     "astro": "workspace:*",
-    "sharp": "^0.31.0"
+    "sharp": "^0.32.1"
   }
 }
diff --git a/packages/integrations/image/test/fixtures/no-alt-text-image/package.json b/packages/integrations/image/test/fixtures/no-alt-text-image/package.json
index 752fc155d7bd..9347ad25db85 100644
--- a/packages/integrations/image/test/fixtures/no-alt-text-image/package.json
+++ b/packages/integrations/image/test/fixtures/no-alt-text-image/package.json
@@ -6,6 +6,6 @@
     "@astrojs/image": "workspace:*",
     "@astrojs/node": "workspace:*",
     "astro": "workspace:*",
-    "sharp": "^0.31.0"
+    "sharp": "^0.32.1"
   }
 }
diff --git a/packages/integrations/image/test/fixtures/no-alt-text-picture/package.json b/packages/integrations/image/test/fixtures/no-alt-text-picture/package.json
index f5f86476e816..f253b6709d8b 100644
--- a/packages/integrations/image/test/fixtures/no-alt-text-picture/package.json
+++ b/packages/integrations/image/test/fixtures/no-alt-text-picture/package.json
@@ -6,6 +6,6 @@
     "@astrojs/image": "workspace:*",
     "@astrojs/node": "workspace:*",
     "astro": "workspace:*",
-    "sharp": "^0.31.0"
+    "sharp": "^0.32.1"
   }
 }
diff --git a/packages/integrations/image/test/fixtures/rotation/package.json b/packages/integrations/image/test/fixtures/rotation/package.json
index 396dd21c55ac..8605d684eb6e 100644
--- a/packages/integrations/image/test/fixtures/rotation/package.json
+++ b/packages/integrations/image/test/fixtures/rotation/package.json
@@ -6,6 +6,6 @@
     "@astrojs/image": "workspace:*",
     "@astrojs/node": "workspace:*",
     "astro": "workspace:*",
-    "sharp": "^0.31.0"
+    "sharp": "^0.32.1"
   }
 }
diff --git a/packages/integrations/image/test/fixtures/with-mdx/package.json b/packages/integrations/image/test/fixtures/with-mdx/package.json
index 91de3430f21b..3d0e8329a622 100644
--- a/packages/integrations/image/test/fixtures/with-mdx/package.json
+++ b/packages/integrations/image/test/fixtures/with-mdx/package.json
@@ -7,6 +7,6 @@
     "@astrojs/mdx": "workspace:*",
     "@astrojs/node": "workspace:*",
     "astro": "workspace:*",
-    "sharp": "^0.31.0"
+    "sharp": "^0.32.1"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5d3f593608fc..2e297884a30e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -748,9 +748,6 @@ importers:
       '@types/server-destroy':
         specifier: ^1.0.1
         version: 1.0.1
-      '@types/sharp':
-        specifier: ^0.31.1
-        version: 0.31.1
       '@types/unist':
         specifier: ^2.0.6
         version: 2.0.6
@@ -794,8 +791,8 @@ importers:
         specifier: ^1.52.2
         version: 1.52.2
       sharp:
-        specifier: ^0.31.3
-        version: 0.31.3
+        specifier: ^0.32.1
+        version: 0.32.1
       srcset-parse:
         specifier: ^1.1.0
         version: 1.1.0
@@ -3600,9 +3597,6 @@ importers:
       '@types/mime':
         specifier: ^2.0.3
         version: 2.0.3
-      '@types/sharp':
-        specifier: ^0.30.5
-        version: 0.30.5
       astro:
         specifier: workspace:*
         version: link:../../astro
@@ -3625,8 +3619,8 @@ importers:
         specifier: ^3.4.0
         version: 3.4.0
       sharp:
-        specifier: ^0.31.0
-        version: 0.31.3
+        specifier: ^0.32.1
+        version: 0.32.1
       vite:
         specifier: ^4.3.1
         version: 4.3.1(@types/node@18.7.21)(sass@1.52.2)
@@ -3652,8 +3646,8 @@ importers:
         specifier: workspace:*
         version: link:../../../../../astro
       sharp:
-        specifier: ^0.31.0
-        version: 0.31.3
+        specifier: ^0.32.1
+        version: 0.32.1
 
   packages/integrations/image/test/fixtures/basic-image:
     dependencies:
@@ -3667,8 +3661,8 @@ importers:
         specifier: workspace:*
         version: link:../../../../../astro
       sharp:
-        specifier: ^0.31.0
-        version: 0.31.3
+        specifier: ^0.32.1
+        version: 0.32.1
 
   packages/integrations/image/test/fixtures/basic-picture:
     dependencies:
@@ -3682,8 +3676,8 @@ importers:
         specifier: workspace:*
         version: link:../../../../../astro
       sharp:
-        specifier: ^0.31.0
-        version: 0.31.3
+        specifier: ^0.32.1
+        version: 0.32.1
 
   packages/integrations/image/test/fixtures/get-image-remote:
     dependencies:
@@ -3694,8 +3688,8 @@ importers:
         specifier: workspace:*
         version: link:../../../../../astro
       sharp:
-        specifier: ^0.31.0
-        version: 0.31.3
+        specifier: ^0.32.1
+        version: 0.32.1
 
   packages/integrations/image/test/fixtures/no-alt-text-image:
     dependencies:
@@ -3709,8 +3703,8 @@ importers:
         specifier: workspace:*
         version: link:../../../../../astro
       sharp:
-        specifier: ^0.31.0
-        version: 0.31.3
+        specifier: ^0.32.1
+        version: 0.32.1
 
   packages/integrations/image/test/fixtures/no-alt-text-picture:
     dependencies:
@@ -3724,8 +3718,8 @@ importers:
         specifier: workspace:*
         version: link:../../../../../astro
       sharp:
-        specifier: ^0.31.0
-        version: 0.31.3
+        specifier: ^0.32.1
+        version: 0.32.1
 
   packages/integrations/image/test/fixtures/rotation:
     dependencies:
@@ -3739,8 +3733,8 @@ importers:
         specifier: workspace:*
         version: link:../../../../../astro
       sharp:
-        specifier: ^0.31.0
-        version: 0.31.3
+        specifier: ^0.32.1
+        version: 0.32.1
 
   packages/integrations/image/test/fixtures/squoosh-service:
     dependencies:
@@ -3769,8 +3763,8 @@ importers:
         specifier: workspace:*
         version: link:../../../../../astro
       sharp:
-        specifier: ^0.31.0
-        version: 0.31.3
+        specifier: ^0.32.1
+        version: 0.32.1
 
   packages/integrations/lit:
     dependencies:
@@ -7685,7 +7679,7 @@ packages:
       nopt: 5.0.0
       npmlog: 5.0.1
       rimraf: 3.0.2
-      semver: 7.3.8
+      semver: 7.5.0
       tar: 6.1.11
     transitivePeerDependencies:
       - encoding
@@ -8699,18 +8693,6 @@ packages:
       '@types/node': 18.7.21
     dev: true
 
-  /@types/sharp@0.30.5:
-    resolution: {integrity: sha512-EhO29617AIBqxoVtpd1qdBanWpspk/kD2B6qTFRJ31Q23Rdf+DNU1xlHSwtqvwq1vgOqBwq1i38SX+HGCymIQg==}
-    dependencies:
-      '@types/node': 18.7.21
-    dev: true
-
-  /@types/sharp@0.31.1:
-    resolution: {integrity: sha512-5nWwamN9ZFHXaYEincMSuza8nNfOof8nmO+mcI+Agx1uMUk4/pQnNIcix+9rLPXzKrm1pS34+6WRDbDV0Jn7ag==}
-    dependencies:
-      '@types/node': 18.7.21
-    dev: true
-
   /@types/stack-trace@0.0.29:
     resolution: {integrity: sha512-TgfOX+mGY/NyNxJLIbDWrO9DjGoVSW9+aB8H2yy1fy32jsvxijhmyJI9fDFgvz3YP4lvJaq9DzdR/M1bOgVc9g==}
     dev: true
@@ -8839,7 +8821,7 @@ packages:
       debug: 4.3.4
       globby: 11.1.0
       is-glob: 4.0.3
-      semver: 7.3.8
+      semver: 7.5.0
       tsutils: 3.21.0(typescript@5.0.2)
       typescript: 5.0.2
     transitivePeerDependencies:
@@ -8860,7 +8842,7 @@ packages:
       '@typescript-eslint/typescript-estree': 5.58.0(typescript@5.0.2)
       eslint: 8.38.0
       eslint-scope: 5.1.1
-      semver: 7.3.8
+      semver: 7.5.0
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -9790,7 +9772,7 @@ packages:
   /builtins@5.0.1:
     resolution: {integrity: sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==}
     dependencies:
-      semver: 7.3.8
+      semver: 7.5.0
     dev: true
 
   /busboy@1.6.0:
@@ -14105,10 +14087,14 @@ packages:
     resolution: {integrity: sha512-jAlSOFR1Bls963NmFwxeQkNTzqjUF0NThm8Le7eRIRGzFUVJuMOFZDLv5Y30W/Oaw+KEebEJLAigwO9gQHoEmw==}
     engines: {node: '>=10'}
     dependencies:
-      semver: 7.3.8
+      semver: 7.5.0
 
   /node-addon-api@5.1.0:
     resolution: {integrity: sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==}
+    dev: false
+
+  /node-addon-api@6.1.0:
+    resolution: {integrity: sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==}
 
   /node-domexception@1.0.0:
     resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}
@@ -14240,7 +14226,7 @@ packages:
     dependencies:
       execa: 6.1.0
       parse-package-name: 1.0.0
-      semver: 7.3.8
+      semver: 7.5.0
       validate-npm-package-name: 4.0.0
     dev: true
 
@@ -15863,6 +15849,13 @@ packages:
     dependencies:
       lru-cache: 6.0.0
 
+  /semver@7.5.0:
+    resolution: {integrity: sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==}
+    engines: {node: '>=10'}
+    hasBin: true
+    dependencies:
+      lru-cache: 6.0.0
+
   /send@0.18.0:
     resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==}
     engines: {node: '>= 0.8.0'}
@@ -15917,7 +15910,22 @@ packages:
       detect-libc: 2.0.1
       node-addon-api: 5.1.0
       prebuild-install: 7.1.1
-      semver: 7.3.8
+      semver: 7.5.0
+      simple-get: 4.0.1
+      tar-fs: 2.1.1
+      tunnel-agent: 0.6.0
+    dev: false
+
+  /sharp@0.32.1:
+    resolution: {integrity: sha512-kQTFtj7ldpUqSe8kDxoGLZc1rnMFU0AO2pqbX6pLy3b7Oj8ivJIdoKNwxHVQG2HN6XpHPJqCSM2nsma2gOXvOg==}
+    engines: {node: '>=14.15.0'}
+    requiresBuild: true
+    dependencies:
+      color: 4.2.3
+      detect-libc: 2.0.1
+      node-addon-api: 6.1.0
+      prebuild-install: 7.1.1
+      semver: 7.5.0
       simple-get: 4.0.1
       tar-fs: 2.1.1
       tunnel-agent: 0.6.0

From 025d3403191d6993e77e37fdf02ec3c7380e2071 Mon Sep 17 00:00:00 2001
From: Princesseuh <princssdev@gmail.com>
Date: Mon, 1 May 2023 17:19:46 +0200
Subject: [PATCH 2/2] fix: revert back to 0.31.0

---
 packages/astro/package.json              | 2 +-
 packages/integrations/image/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/astro/package.json b/packages/astro/package.json
index a4ba857cb4c3..d14efb80c720 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -201,7 +201,7 @@
     "unified": "^10.1.2"
   },
   "peerDependencies": {
-    "sharp": ">=0.32.0"
+    "sharp": ">=0.31.0"
   },
   "peerDependenciesMeta": {
     "sharp": {
diff --git a/packages/integrations/image/package.json b/packages/integrations/image/package.json
index db8231b45339..55657ad8ac36 100644
--- a/packages/integrations/image/package.json
+++ b/packages/integrations/image/package.json
@@ -63,7 +63,7 @@
   },
   "peerDependencies": {
     "astro": "workspace:^2.3.2",
-    "sharp": ">=0.32.0"
+    "sharp": ">=0.31.0"
   },
   "peerDependenciesMeta": {
     "sharp": {