michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: fix sharp semver range to allow for 0.32.0 (#6952)

Browse source 
* fix: fix sharp semver range to allow for 0.3é20

* fix: revert back to 0.31.0
This commit is contained in:
Erika 2023-05-01 17:32:50 +02:00 committed by GitHub
parent d0cf3a2c01
commit e5bd084c01
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 70 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.changeset/thick-frogs-call.md Normal file
View file

@ -0,0 +1,6 @@
---
'@astrojs/image': patch
'astro': patch
---
Update allowed Sharp versions to support 0.32.0

5
packages/astro/package.json
View file

@ -181,7 +181,6 @@
"@types/rimraf": "^3.0.2", "@types/rimraf": "^3.0.2",
"@types/send": "^0.17.1", "@types/send": "^0.17.1",
"@types/server-destroy": "^1.0.1", "@types/server-destroy": "^1.0.1",
"@types/sharp": "^0.31.1",
"@types/unist": "^2.0.6", "@types/unist": "^2.0.6",
"astro-scripts": "workspace:*", "astro-scripts": "workspace:*",
"chai": "^4.3.6", "chai": "^4.3.6",
@ -196,13 +195,13 @@
"remark-code-titles": "^0.1.2", "remark-code-titles": "^0.1.2",
"rollup": "^3.9.0", "rollup": "^3.9.0",
"sass": "^1.52.2", "sass": "^1.52.2",
"sharp": "^0.31.3", "sharp": "^0.32.1",
"srcset-parse": "^1.1.0", "srcset-parse": "^1.1.0",
"undici": "^5.22.0", "undici": "^5.22.0",
"unified": "^10.1.2" "unified": "^10.1.2"
}, },
"peerDependencies": { "peerDependencies": {
"sharp": "^0.31.3" "sharp": ">=0.31.0"
}, },
"peerDependenciesMeta": { "peerDependenciesMeta": {
"sharp": { "sharp": {

3
packages/integrations/image/package.json
View file

@ -51,7 +51,6 @@
"devDependencies": { "devDependencies": {
"@types/http-cache-semantics": "^4.0.1", "@types/http-cache-semantics": "^4.0.1",
"@types/mime": "^2.0.3", "@types/mime": "^2.0.3",
"@types/sharp": "^0.30.5",
"astro": "workspace:*", "astro": "workspace:*",
"astro-scripts": "workspace:*", "astro-scripts": "workspace:*",
"chai": "^4.3.6", "chai": "^4.3.6",
@ -59,7 +58,7 @@
"fast-glob": "^3.2.11", "fast-glob": "^3.2.11",
"mocha": "^9.2.2", "mocha": "^9.2.2",
"rollup-plugin-copy": "^3.4.0", "rollup-plugin-copy": "^3.4.0",
"sharp": "^0.31.0", "sharp": "^0.32.1",
"vite": "^4.3.1" "vite": "^4.3.1"
}, },
"peerDependencies": { "peerDependencies": {

2
packages/integrations/image/test/fixtures/background-color-image/package.json vendored
View file

@ -6,6 +6,6 @@
"@astrojs/image": "workspace:*", "@astrojs/image": "workspace:*",
"@astrojs/node": "workspace:*", "@astrojs/node": "workspace:*",
"astro": "workspace:*", "astro": "workspace:*",
"sharp": "^0.31.0" "sharp": "^0.32.1"
} }
} }

2
packages/integrations/image/test/fixtures/basic-image/package.json vendored
View file

@ -6,6 +6,6 @@
"@astrojs/image": "workspace:*", "@astrojs/image": "workspace:*",
"@astrojs/node": "workspace:*", "@astrojs/node": "workspace:*",
"astro": "workspace:*", "astro": "workspace:*",
"sharp": "^0.31.0" "sharp": "^0.32.1"
} }
} }

2
packages/integrations/image/test/fixtures/basic-picture/package.json vendored
View file

@ -6,6 +6,6 @@
"@astrojs/image": "workspace:*", "@astrojs/image": "workspace:*",
"@astrojs/node": "workspace:*", "@astrojs/node": "workspace:*",
"astro": "workspace:*", "astro": "workspace:*",
"sharp": "^0.31.0" "sharp": "^0.32.1"
} }
} }

2
packages/integrations/image/test/fixtures/get-image-remote/package.json vendored
View file

@ -5,6 +5,6 @@
"dependencies": { "dependencies": {
"@astrojs/image": "workspace:*", "@astrojs/image": "workspace:*",
"astro": "workspace:*", "astro": "workspace:*",
"sharp": "^0.31.0" "sharp": "^0.32.1"
} }
} }

2
packages/integrations/image/test/fixtures/no-alt-text-image/package.json vendored
View file

@ -6,6 +6,6 @@
"@astrojs/image": "workspace:*", "@astrojs/image": "workspace:*",
"@astrojs/node": "workspace:*", "@astrojs/node": "workspace:*",
"astro": "workspace:*", "astro": "workspace:*",
"sharp": "^0.31.0" "sharp": "^0.32.1"
} }
} }

2
packages/integrations/image/test/fixtures/no-alt-text-picture/package.json vendored
View file

@ -6,6 +6,6 @@
"@astrojs/image": "workspace:*", "@astrojs/image": "workspace:*",
"@astrojs/node": "workspace:*", "@astrojs/node": "workspace:*",
"astro": "workspace:*", "astro": "workspace:*",
"sharp": "^0.31.0" "sharp": "^0.32.1"
} }
} }

2
packages/integrations/image/test/fixtures/rotation/package.json vendored
View file

@ -6,6 +6,6 @@
"@astrojs/image": "workspace:*", "@astrojs/image": "workspace:*",
"@astrojs/node": "workspace:*", "@astrojs/node": "workspace:*",
"astro": "workspace:*", "astro": "workspace:*",
"sharp": "^0.31.0" "sharp": "^0.32.1"
} }
} }

2
packages/integrations/image/test/fixtures/with-mdx/package.json vendored
View file

@ -7,6 +7,6 @@
"@astrojs/mdx": "workspace:*", "@astrojs/mdx": "workspace:*",
"@astrojs/node": "workspace:*", "@astrojs/node": "workspace:*",
"astro": "workspace:*", "astro": "workspace:*",
"sharp": "^0.31.0" "sharp": "^0.32.1"
} }
} }

98
pnpm-lock.yaml
View file

@ -748,9 +748,6 @@ importers:
'@types/server-destroy': '@types/server-destroy':
specifier: ^1.0.1 specifier: ^1.0.1
version: 1.0.1 version: 1.0.1
'@types/sharp':
specifier: ^0.31.1
version: 0.31.1
'@types/unist': '@types/unist':
specifier: ^2.0.6 specifier: ^2.0.6
version: 2.0.6 version: 2.0.6
@ -794,8 +791,8 @@ importers:
specifier: ^1.52.2 specifier: ^1.52.2
version: 1.52.2 version: 1.52.2
sharp: sharp:
specifier: ^0.31.3 specifier: ^0.32.1
version: 0.31.3 version: 0.32.1
srcset-parse: srcset-parse:
specifier: ^1.1.0 specifier: ^1.1.0
version: 1.1.0 version: 1.1.0
@ -3612,9 +3609,6 @@ importers:
'@types/mime': '@types/mime':
specifier: ^2.0.3 specifier: ^2.0.3
version: 2.0.3 version: 2.0.3
'@types/sharp':
specifier: ^0.30.5
version: 0.30.5
astro: astro:
specifier: workspace:* specifier: workspace:*
version: link:../../astro version: link:../../astro
@ -3637,8 +3631,8 @@ importers:
specifier: ^3.4.0 specifier: ^3.4.0
version: 3.4.0 version: 3.4.0
sharp: sharp:
specifier: ^0.31.0 specifier: ^0.32.1
version: 0.31.3 version: 0.32.1
vite: vite:
specifier: ^4.3.1 specifier: ^4.3.1
version: 4.3.1(@types/node@18.7.21)(sass@1.52.2) version: 4.3.1(@types/node@18.7.21)(sass@1.52.2)
@ -3664,8 +3658,8 @@ importers:
specifier: workspace:* specifier: workspace:*
version: link:../../../../../astro version: link:../../../../../astro
sharp: sharp:
specifier: ^0.31.0 specifier: ^0.32.1
version: 0.31.3 version: 0.32.1
packages/integrations/image/test/fixtures/basic-image: packages/integrations/image/test/fixtures/basic-image:
dependencies: dependencies:
@ -3679,8 +3673,8 @@ importers:
specifier: workspace:* specifier: workspace:*
version: link:../../../../../astro version: link:../../../../../astro
sharp: sharp:
specifier: ^0.31.0 specifier: ^0.32.1
version: 0.31.3 version: 0.32.1
packages/integrations/image/test/fixtures/basic-picture: packages/integrations/image/test/fixtures/basic-picture:
dependencies: dependencies:
@ -3694,8 +3688,8 @@ importers:
specifier: workspace:* specifier: workspace:*
version: link:../../../../../astro version: link:../../../../../astro
sharp: sharp:
specifier: ^0.31.0 specifier: ^0.32.1
version: 0.31.3 version: 0.32.1
packages/integrations/image/test/fixtures/get-image-remote: packages/integrations/image/test/fixtures/get-image-remote:
dependencies: dependencies:
@ -3706,8 +3700,8 @@ importers:
specifier: workspace:* specifier: workspace:*
version: link:../../../../../astro version: link:../../../../../astro
sharp: sharp:
specifier: ^0.31.0 specifier: ^0.32.1
version: 0.31.3 version: 0.32.1
packages/integrations/image/test/fixtures/no-alt-text-image: packages/integrations/image/test/fixtures/no-alt-text-image:
dependencies: dependencies:
@ -3721,8 +3715,8 @@ importers:
specifier: workspace:* specifier: workspace:*
version: link:../../../../../astro version: link:../../../../../astro
sharp: sharp:
specifier: ^0.31.0 specifier: ^0.32.1
version: 0.31.3 version: 0.32.1
packages/integrations/image/test/fixtures/no-alt-text-picture: packages/integrations/image/test/fixtures/no-alt-text-picture:
dependencies: dependencies:
@ -3736,8 +3730,8 @@ importers:
specifier: workspace:* specifier: workspace:*
version: link:../../../../../astro version: link:../../../../../astro
sharp: sharp:
specifier: ^0.31.0 specifier: ^0.32.1
version: 0.31.3 version: 0.32.1
packages/integrations/image/test/fixtures/rotation: packages/integrations/image/test/fixtures/rotation:
dependencies: dependencies:
@ -3751,8 +3745,8 @@ importers:
specifier: workspace:* specifier: workspace:*
version: link:../../../../../astro version: link:../../../../../astro
sharp: sharp:
specifier: ^0.31.0 specifier: ^0.32.1
version: 0.31.3 version: 0.32.1
packages/integrations/image/test/fixtures/squoosh-service: packages/integrations/image/test/fixtures/squoosh-service:
dependencies: dependencies:
@ -3781,8 +3775,8 @@ importers:
specifier: workspace:* specifier: workspace:*
version: link:../../../../../astro version: link:../../../../../astro
sharp: sharp:
specifier: ^0.31.0 specifier: ^0.32.1
version: 0.31.3 version: 0.32.1
packages/integrations/lit: packages/integrations/lit:
dependencies: dependencies:
@ -7704,7 +7698,7 @@ packages:
nopt: 5.0.0 nopt: 5.0.0
npmlog: 5.0.1 npmlog: 5.0.1
rimraf: 3.0.2 rimraf: 3.0.2
semver: 7.3.8 semver: 7.5.0
tar: 6.1.11 tar: 6.1.11
transitivePeerDependencies: transitivePeerDependencies:
- encoding - encoding
@ -8718,18 +8712,6 @@ packages:
'@types/node': 18.7.21 '@types/node': 18.7.21
dev: true 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: /@types/stack-trace@0.0.29:
resolution: {integrity: sha512-TgfOX+mGY/NyNxJLIbDWrO9DjGoVSW9+aB8H2yy1fy32jsvxijhmyJI9fDFgvz3YP4lvJaq9DzdR/M1bOgVc9g==} resolution: {integrity: sha512-TgfOX+mGY/NyNxJLIbDWrO9DjGoVSW9+aB8H2yy1fy32jsvxijhmyJI9fDFgvz3YP4lvJaq9DzdR/M1bOgVc9g==}
dev: true dev: true
@ -8858,7 +8840,7 @@ packages:
debug: 4.3.4 debug: 4.3.4
globby: 11.1.0 globby: 11.1.0
is-glob: 4.0.3 is-glob: 4.0.3
semver: 7.3.8 semver: 7.5.0
tsutils: 3.21.0(typescript@5.0.2) tsutils: 3.21.0(typescript@5.0.2)
typescript: 5.0.2 typescript: 5.0.2
transitivePeerDependencies: transitivePeerDependencies:
@ -8879,7 +8861,7 @@ packages:
'@typescript-eslint/typescript-estree': 5.58.0(typescript@5.0.2) '@typescript-eslint/typescript-estree': 5.58.0(typescript@5.0.2)
eslint: 8.38.0 eslint: 8.38.0
eslint-scope: 5.1.1 eslint-scope: 5.1.1
semver: 7.3.8 semver: 7.5.0
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
- typescript - typescript
@ -9809,7 +9791,7 @@ packages:
/builtins@5.0.1: /builtins@5.0.1:
resolution: {integrity: sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==} resolution: {integrity: sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==}
dependencies: dependencies:
semver: 7.3.8 semver: 7.5.0
dev: true dev: true
/busboy@1.6.0: /busboy@1.6.0:
@ -14124,10 +14106,14 @@ packages:
resolution: {integrity: sha512-jAlSOFR1Bls963NmFwxeQkNTzqjUF0NThm8Le7eRIRGzFUVJuMOFZDLv5Y30W/Oaw+KEebEJLAigwO9gQHoEmw==} resolution: {integrity: sha512-jAlSOFR1Bls963NmFwxeQkNTzqjUF0NThm8Le7eRIRGzFUVJuMOFZDLv5Y30W/Oaw+KEebEJLAigwO9gQHoEmw==}
engines: {node: '>=10'} engines: {node: '>=10'}
dependencies: dependencies:
semver: 7.3.8 semver: 7.5.0
/node-addon-api@5.1.0: /node-addon-api@5.1.0:
resolution: {integrity: sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==} 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: /node-domexception@1.0.0:
resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==} resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}
@ -14259,7 +14245,7 @@ packages:
dependencies: dependencies:
execa: 6.1.0 execa: 6.1.0
parse-package-name: 1.0.0 parse-package-name: 1.0.0
semver: 7.3.8 semver: 7.5.0
validate-npm-package-name: 4.0.0 validate-npm-package-name: 4.0.0
dev: true dev: true
@ -15871,6 +15857,13 @@ packages:
dependencies: dependencies:
lru-cache: 6.0.0 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: /send@0.18.0:
resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==} resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==}
engines: {node: '>= 0.8.0'} engines: {node: '>= 0.8.0'}
@ -15925,7 +15918,22 @@ packages:
detect-libc: 2.0.1 detect-libc: 2.0.1
node-addon-api: 5.1.0 node-addon-api: 5.1.0
prebuild-install: 7.1.1 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 simple-get: 4.0.1
tar-fs: 2.1.1 tar-fs: 2.1.1
tunnel-agent: 0.6.0 tunnel-agent: 0.6.0