1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-24 08:12:24 +02:00

Chore: Upgrade to sharp 0.33.0 to fix random CI failures

This commit is contained in:
Laurent Cozic 2023-11-29 15:13:57 +01:00
parent 7ce954da30
commit 2924bb5437
4 changed files with 254 additions and 49 deletions

View File

@ -57,7 +57,7 @@
"proper-lockfile": "4.1.2", "proper-lockfile": "4.1.2",
"read-chunk": "2.1.0", "read-chunk": "2.1.0",
"server-destroy": "1.0.1", "server-destroy": "1.0.1",
"sharp": "0.32.6", "sharp": "0.33.0",
"sprintf-js": "1.1.3", "sprintf-js": "1.1.3",
"sqlite3": "5.1.6", "sqlite3": "5.1.6",
"string-padding": "1.0.2", "string-padding": "1.0.2",

View File

@ -25,7 +25,7 @@
"@types/uuid": "9.0.6", "@types/uuid": "9.0.6",
"clean-html": "1.5.0", "clean-html": "1.5.0",
"jest": "29.7.0", "jest": "29.7.0",
"sharp": "0.32.6", "sharp": "0.33.0",
"typescript": "5.2.2" "typescript": "5.2.2"
}, },
"dependencies": { "dependencies": {

View File

@ -36,7 +36,7 @@
"node-fetch": "2.6.7", "node-fetch": "2.6.7",
"relative": "3.0.2", "relative": "3.0.2",
"request": "2.88.2", "request": "2.88.2",
"sharp": "0.32.6", "sharp": "0.33.0",
"source-map-support": "0.5.21", "source-map-support": "0.5.21",
"uri-template": "2.0.0", "uri-template": "2.0.0",
"yargs": "17.7.2" "yargs": "17.7.2"

297
yarn.lock
View File

@ -5295,6 +5295,15 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@emnapi/runtime@npm:^0.44.0":
version: 0.44.0
resolution: "@emnapi/runtime@npm:0.44.0"
dependencies:
tslib: ^2.4.0
checksum: e07235d6347bfb7cececb6b06e91177e73ec57fdeb2ec371725a7feec684699b739d9e295be8c58a5b2a3cb2db2351c0a2a3b212dd1f400e0455c73445f199d3
languageName: node
linkType: hard
"@emotion/babel-plugin@npm:^11.10.5": "@emotion/babel-plugin@npm:^11.10.5":
version: 11.10.5 version: 11.10.5
resolution: "@emotion/babel-plugin@npm:11.10.5" resolution: "@emotion/babel-plugin@npm:11.10.5"
@ -5771,6 +5780,181 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@img/sharp-darwin-arm64@npm:0.33.0":
version: 0.33.0
resolution: "@img/sharp-darwin-arm64@npm:0.33.0"
dependencies:
"@img/sharp-libvips-darwin-arm64": 1.0.0
dependenciesMeta:
"@img/sharp-libvips-darwin-arm64":
optional: true
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard
"@img/sharp-darwin-x64@npm:0.33.0":
version: 0.33.0
resolution: "@img/sharp-darwin-x64@npm:0.33.0"
dependencies:
"@img/sharp-libvips-darwin-x64": 1.0.0
dependenciesMeta:
"@img/sharp-libvips-darwin-x64":
optional: true
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard
"@img/sharp-libvips-darwin-arm64@npm:1.0.0":
version: 1.0.0
resolution: "@img/sharp-libvips-darwin-arm64@npm:1.0.0"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard
"@img/sharp-libvips-darwin-x64@npm:1.0.0":
version: 1.0.0
resolution: "@img/sharp-libvips-darwin-x64@npm:1.0.0"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard
"@img/sharp-libvips-linux-arm64@npm:1.0.0":
version: 1.0.0
resolution: "@img/sharp-libvips-linux-arm64@npm:1.0.0"
conditions: os=linux & cpu=arm64 & libc=glibc
languageName: node
linkType: hard
"@img/sharp-libvips-linux-arm@npm:1.0.0":
version: 1.0.0
resolution: "@img/sharp-libvips-linux-arm@npm:1.0.0"
conditions: os=linux & cpu=arm & libc=glibc
languageName: node
linkType: hard
"@img/sharp-libvips-linux-s390x@npm:1.0.0":
version: 1.0.0
resolution: "@img/sharp-libvips-linux-s390x@npm:1.0.0"
conditions: os=linux & cpu=s390x & libc=glibc
languageName: node
linkType: hard
"@img/sharp-libvips-linux-x64@npm:1.0.0":
version: 1.0.0
resolution: "@img/sharp-libvips-linux-x64@npm:1.0.0"
conditions: os=linux & cpu=x64 & libc=glibc
languageName: node
linkType: hard
"@img/sharp-libvips-linuxmusl-arm64@npm:1.0.0":
version: 1.0.0
resolution: "@img/sharp-libvips-linuxmusl-arm64@npm:1.0.0"
conditions: os=linux & cpu=arm64 & libc=musl
languageName: node
linkType: hard
"@img/sharp-libvips-linuxmusl-x64@npm:1.0.0":
version: 1.0.0
resolution: "@img/sharp-libvips-linuxmusl-x64@npm:1.0.0"
conditions: os=linux & cpu=x64 & libc=musl
languageName: node
linkType: hard
"@img/sharp-linux-arm64@npm:0.33.0":
version: 0.33.0
resolution: "@img/sharp-linux-arm64@npm:0.33.0"
dependencies:
"@img/sharp-libvips-linux-arm64": 1.0.0
dependenciesMeta:
"@img/sharp-libvips-linux-arm64":
optional: true
conditions: os=linux & cpu=arm64 & libc=glibc
languageName: node
linkType: hard
"@img/sharp-linux-arm@npm:0.33.0":
version: 0.33.0
resolution: "@img/sharp-linux-arm@npm:0.33.0"
dependencies:
"@img/sharp-libvips-linux-arm": 1.0.0
dependenciesMeta:
"@img/sharp-libvips-linux-arm":
optional: true
conditions: os=linux & cpu=arm & libc=glibc
languageName: node
linkType: hard
"@img/sharp-linux-s390x@npm:0.33.0":
version: 0.33.0
resolution: "@img/sharp-linux-s390x@npm:0.33.0"
dependencies:
"@img/sharp-libvips-linux-s390x": 1.0.0
dependenciesMeta:
"@img/sharp-libvips-linux-s390x":
optional: true
conditions: os=linux & cpu=s390x & libc=glibc
languageName: node
linkType: hard
"@img/sharp-linux-x64@npm:0.33.0":
version: 0.33.0
resolution: "@img/sharp-linux-x64@npm:0.33.0"
dependencies:
"@img/sharp-libvips-linux-x64": 1.0.0
dependenciesMeta:
"@img/sharp-libvips-linux-x64":
optional: true
conditions: os=linux & cpu=x64 & libc=glibc
languageName: node
linkType: hard
"@img/sharp-linuxmusl-arm64@npm:0.33.0":
version: 0.33.0
resolution: "@img/sharp-linuxmusl-arm64@npm:0.33.0"
dependencies:
"@img/sharp-libvips-linuxmusl-arm64": 1.0.0
dependenciesMeta:
"@img/sharp-libvips-linuxmusl-arm64":
optional: true
conditions: os=linux & cpu=arm64 & libc=musl
languageName: node
linkType: hard
"@img/sharp-linuxmusl-x64@npm:0.33.0":
version: 0.33.0
resolution: "@img/sharp-linuxmusl-x64@npm:0.33.0"
dependencies:
"@img/sharp-libvips-linuxmusl-x64": 1.0.0
dependenciesMeta:
"@img/sharp-libvips-linuxmusl-x64":
optional: true
conditions: os=linux & cpu=x64 & libc=musl
languageName: node
linkType: hard
"@img/sharp-wasm32@npm:0.33.0":
version: 0.33.0
resolution: "@img/sharp-wasm32@npm:0.33.0"
dependencies:
"@emnapi/runtime": ^0.44.0
conditions: cpu=wasm32
languageName: node
linkType: hard
"@img/sharp-win32-ia32@npm:0.33.0":
version: 0.33.0
resolution: "@img/sharp-win32-ia32@npm:0.33.0"
conditions: os=win32 & cpu=ia32
languageName: node
linkType: hard
"@img/sharp-win32-x64@npm:0.33.0":
version: 0.33.0
resolution: "@img/sharp-win32-x64@npm:0.33.0"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard
"@isaacs/cliui@npm:^8.0.2": "@isaacs/cliui@npm:^8.0.2":
version: 8.0.2 version: 8.0.2
resolution: "@isaacs/cliui@npm:8.0.2" resolution: "@isaacs/cliui@npm:8.0.2"
@ -6584,7 +6768,7 @@ __metadata:
relative: 3.0.2 relative: 3.0.2
reselect: 4.1.8 reselect: 4.1.8
server-destroy: 1.0.1 server-destroy: 1.0.1
sharp: 0.32.6 sharp: 0.33.0
sprintf-js: 1.1.3 sprintf-js: 1.1.3
sqlite3: 5.1.6 sqlite3: 5.1.6
string-padding: 1.0.2 string-padding: 1.0.2
@ -6827,7 +7011,7 @@ __metadata:
request: 2.88.2 request: 2.88.2
rss: 1.2.2 rss: 1.2.2
sass: 1.69.5 sass: 1.69.5
sharp: 0.32.6 sharp: 0.33.0
source-map-support: 0.5.21 source-map-support: 0.5.21
sqlite3: 5.1.6 sqlite3: 5.1.6
style-to-js: 1.1.9 style-to-js: 1.1.9
@ -26334,7 +26518,7 @@ __metadata:
proper-lockfile: 4.1.2 proper-lockfile: 4.1.2
read-chunk: 2.1.0 read-chunk: 2.1.0
server-destroy: 1.0.1 server-destroy: 1.0.1
sharp: 0.32.6 sharp: 0.33.0
sprintf-js: 1.1.3 sprintf-js: 1.1.3
sqlite3: 5.1.6 sqlite3: 5.1.6
string-padding: 1.0.2 string-padding: 1.0.2
@ -30546,15 +30730,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"node-addon-api@npm:^6.1.0":
version: 6.1.0
resolution: "node-addon-api@npm:6.1.0"
dependencies:
node-gyp: latest
checksum: 3a539510e677cfa3a833aca5397300e36141aca064cdc487554f2017110709a03a95da937e98c2a14ec3c626af7b2d1b6dabe629a481f9883143d0d5bff07bf2
languageName: node
linkType: hard
"node-api-version@npm:^0.1.4": "node-api-version@npm:^0.1.4":
version: 0.1.4 version: 0.1.4
resolution: "node-api-version@npm:0.1.4" resolution: "node-api-version@npm:0.1.4"
@ -33630,7 +33805,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"prebuild-install@npm:^7.0.1, prebuild-install@npm:^7.1.1": "prebuild-install@npm:^7.0.1":
version: 7.1.1 version: 7.1.1
resolution: "prebuild-install@npm:7.1.1" resolution: "prebuild-install@npm:7.1.1"
dependencies: dependencies:
@ -37465,20 +37640,72 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"sharp@npm:0.32.6": "sharp@npm:0.33.0":
version: 0.32.6 version: 0.33.0
resolution: "sharp@npm:0.32.6" resolution: "sharp@npm:0.33.0"
dependencies: dependencies:
"@img/sharp-darwin-arm64": 0.33.0
"@img/sharp-darwin-x64": 0.33.0
"@img/sharp-libvips-darwin-arm64": 1.0.0
"@img/sharp-libvips-darwin-x64": 1.0.0
"@img/sharp-libvips-linux-arm": 1.0.0
"@img/sharp-libvips-linux-arm64": 1.0.0
"@img/sharp-libvips-linux-s390x": 1.0.0
"@img/sharp-libvips-linux-x64": 1.0.0
"@img/sharp-libvips-linuxmusl-arm64": 1.0.0
"@img/sharp-libvips-linuxmusl-x64": 1.0.0
"@img/sharp-linux-arm": 0.33.0
"@img/sharp-linux-arm64": 0.33.0
"@img/sharp-linux-s390x": 0.33.0
"@img/sharp-linux-x64": 0.33.0
"@img/sharp-linuxmusl-arm64": 0.33.0
"@img/sharp-linuxmusl-x64": 0.33.0
"@img/sharp-wasm32": 0.33.0
"@img/sharp-win32-ia32": 0.33.0
"@img/sharp-win32-x64": 0.33.0
color: ^4.2.3 color: ^4.2.3
detect-libc: ^2.0.2 detect-libc: ^2.0.2
node-addon-api: ^6.1.0
node-gyp: latest
prebuild-install: ^7.1.1
semver: ^7.5.4 semver: ^7.5.4
simple-get: ^4.0.1 dependenciesMeta:
tar-fs: ^3.0.4 "@img/sharp-darwin-arm64":
tunnel-agent: ^0.6.0 optional: true
checksum: 0cca1d16b1920800c0e22d27bc6305f4c67c9ebe44f67daceb30bf645ae39e7fb7dfbd7f5d6cd9f9eebfddd87ac3f7e2695f4eb906d19b7a775286238e6a29fc "@img/sharp-darwin-x64":
optional: true
"@img/sharp-libvips-darwin-arm64":
optional: true
"@img/sharp-libvips-darwin-x64":
optional: true
"@img/sharp-libvips-linux-arm":
optional: true
"@img/sharp-libvips-linux-arm64":
optional: true
"@img/sharp-libvips-linux-s390x":
optional: true
"@img/sharp-libvips-linux-x64":
optional: true
"@img/sharp-libvips-linuxmusl-arm64":
optional: true
"@img/sharp-libvips-linuxmusl-x64":
optional: true
"@img/sharp-linux-arm":
optional: true
"@img/sharp-linux-arm64":
optional: true
"@img/sharp-linux-s390x":
optional: true
"@img/sharp-linux-x64":
optional: true
"@img/sharp-linuxmusl-arm64":
optional: true
"@img/sharp-linuxmusl-x64":
optional: true
"@img/sharp-wasm32":
optional: true
"@img/sharp-win32-ia32":
optional: true
"@img/sharp-win32-x64":
optional: true
checksum: a140577f7a316642c4bbc3f654e7ee7b86d32f0c5ee572df1a09519ca5972d2fe45fbb3213df65fcffafbe4b2acbc57172dc035cca844153eba2b66465910d02
languageName: node languageName: node
linkType: hard linkType: hard
@ -37701,17 +37928,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"simple-get@npm:^4.0.1":
version: 4.0.1
resolution: "simple-get@npm:4.0.1"
dependencies:
decompress-response: ^6.0.0
once: ^1.3.1
simple-concat: ^1.0.0
checksum: e4132fd27cf7af230d853fa45c1b8ce900cb430dd0a3c6d3829649fe4f2b26574c803698076c4006450efb0fad2ba8c5455fbb5755d4b0a5ec42d4f12b31d27e
languageName: node
linkType: hard
"simple-swizzle@npm:^0.2.2": "simple-swizzle@npm:^0.2.2":
version: 0.2.2 version: 0.2.2
resolution: "simple-swizzle@npm:0.2.2" resolution: "simple-swizzle@npm:0.2.2"
@ -39529,18 +39745,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"tar-fs@npm:^3.0.4": "tar-stream@npm:3.1.6":
version: 3.0.4
resolution: "tar-fs@npm:3.0.4"
dependencies:
mkdirp-classic: ^0.5.2
pump: ^3.0.0
tar-stream: ^3.1.5
checksum: dcf4054f9e92ca0efe61c2b3f612914fb259a47900aa908a63106513a6d006c899b426ada53eb88d9dbbf089b5724c8e90b96a2c4ca6171845fa14203d734e30
languageName: node
linkType: hard
"tar-stream@npm:3.1.6, tar-stream@npm:^3.1.5":
version: 3.1.6 version: 3.1.6
resolution: "tar-stream@npm:3.1.6" resolution: "tar-stream@npm:3.1.6"
dependencies: dependencies: