mirror of
https://github.com/strapi/strapi.git
synced 2025-09-25 08:19:07 +00:00
Merge branch 'develop' into chore/labelAction
This commit is contained in:
DMehaffy
GitHub
commit
2106229f0e
@ -66,7 +66,7 @@
|
||||
"react-query": "3.39.3",
|
||||
"react-redux": "8.1.1",
|
||||
"react-select": "5.7.0",
|
||||
"sharp": "0.32.6",
|
||||
"sharp": "0.33.3",
|
||||
"yup": "0.32.9"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
||||
346
yarn.lock
346
yarn.lock
@ -2627,6 +2627,15 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@emnapi/runtime@npm:^1.1.0":
|
||||
version: 1.1.0
|
||||
resolution: "@emnapi/runtime@npm:1.1.0"
|
||||
dependencies:
|
||||
tslib: "npm:^2.4.0"
|
||||
checksum: b3db72e1cd36cac3bc1edb6a1312690c449d9b21b9c3a9c74708acc29a54cc0cbb50cd24c31c9c585ae69f1daab4031373d9ff3bb9f8527e052c0a0d4529b9fd
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@emotion/babel-plugin@npm:^11.10.5":
|
||||
version: 11.10.5
|
||||
resolution: "@emotion/babel-plugin@npm:11.10.5"
|
||||
@ -3727,6 +3736,181 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@img/sharp-darwin-arm64@npm:0.33.3":
|
||||
version: 0.33.3
|
||||
resolution: "@img/sharp-darwin-arm64@npm:0.33.3"
|
||||
dependencies:
|
||||
"@img/sharp-libvips-darwin-arm64": "npm:1.0.2"
|
||||
dependenciesMeta:
|
||||
"@img/sharp-libvips-darwin-arm64":
|
||||
optional: true
|
||||
conditions: os=darwin & cpu=arm64
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@img/sharp-darwin-x64@npm:0.33.3":
|
||||
version: 0.33.3
|
||||
resolution: "@img/sharp-darwin-x64@npm:0.33.3"
|
||||
dependencies:
|
||||
"@img/sharp-libvips-darwin-x64": "npm:1.0.2"
|
||||
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.2":
|
||||
version: 1.0.2
|
||||
resolution: "@img/sharp-libvips-darwin-arm64@npm:1.0.2"
|
||||
conditions: os=darwin & cpu=arm64
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@img/sharp-libvips-darwin-x64@npm:1.0.2":
|
||||
version: 1.0.2
|
||||
resolution: "@img/sharp-libvips-darwin-x64@npm:1.0.2"
|
||||
conditions: os=darwin & cpu=x64
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@img/sharp-libvips-linux-arm64@npm:1.0.2":
|
||||
version: 1.0.2
|
||||
resolution: "@img/sharp-libvips-linux-arm64@npm:1.0.2"
|
||||
conditions: os=linux & cpu=arm64 & libc=glibc
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@img/sharp-libvips-linux-arm@npm:1.0.2":
|
||||
version: 1.0.2
|
||||
resolution: "@img/sharp-libvips-linux-arm@npm:1.0.2"
|
||||
conditions: os=linux & cpu=arm & libc=glibc
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@img/sharp-libvips-linux-s390x@npm:1.0.2":
|
||||
version: 1.0.2
|
||||
resolution: "@img/sharp-libvips-linux-s390x@npm:1.0.2"
|
||||
conditions: os=linux & cpu=s390x & libc=glibc
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@img/sharp-libvips-linux-x64@npm:1.0.2":
|
||||
version: 1.0.2
|
||||
resolution: "@img/sharp-libvips-linux-x64@npm:1.0.2"
|
||||
conditions: os=linux & cpu=x64 & libc=glibc
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@img/sharp-libvips-linuxmusl-arm64@npm:1.0.2":
|
||||
version: 1.0.2
|
||||
resolution: "@img/sharp-libvips-linuxmusl-arm64@npm:1.0.2"
|
||||
conditions: os=linux & cpu=arm64 & libc=musl
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@img/sharp-libvips-linuxmusl-x64@npm:1.0.2":
|
||||
version: 1.0.2
|
||||
resolution: "@img/sharp-libvips-linuxmusl-x64@npm:1.0.2"
|
||||
conditions: os=linux & cpu=x64 & libc=musl
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@img/sharp-linux-arm64@npm:0.33.3":
|
||||
version: 0.33.3
|
||||
resolution: "@img/sharp-linux-arm64@npm:0.33.3"
|
||||
dependencies:
|
||||
"@img/sharp-libvips-linux-arm64": "npm:1.0.2"
|
||||
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.3":
|
||||
version: 0.33.3
|
||||
resolution: "@img/sharp-linux-arm@npm:0.33.3"
|
||||
dependencies:
|
||||
"@img/sharp-libvips-linux-arm": "npm:1.0.2"
|
||||
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.3":
|
||||
version: 0.33.3
|
||||
resolution: "@img/sharp-linux-s390x@npm:0.33.3"
|
||||
dependencies:
|
||||
"@img/sharp-libvips-linux-s390x": "npm:1.0.2"
|
||||
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.3":
|
||||
version: 0.33.3
|
||||
resolution: "@img/sharp-linux-x64@npm:0.33.3"
|
||||
dependencies:
|
||||
"@img/sharp-libvips-linux-x64": "npm:1.0.2"
|
||||
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.3":
|
||||
version: 0.33.3
|
||||
resolution: "@img/sharp-linuxmusl-arm64@npm:0.33.3"
|
||||
dependencies:
|
||||
"@img/sharp-libvips-linuxmusl-arm64": "npm:1.0.2"
|
||||
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.3":
|
||||
version: 0.33.3
|
||||
resolution: "@img/sharp-linuxmusl-x64@npm:0.33.3"
|
||||
dependencies:
|
||||
"@img/sharp-libvips-linuxmusl-x64": "npm:1.0.2"
|
||||
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.3":
|
||||
version: 0.33.3
|
||||
resolution: "@img/sharp-wasm32@npm:0.33.3"
|
||||
dependencies:
|
||||
"@emnapi/runtime": "npm:^1.1.0"
|
||||
conditions: cpu=wasm32
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@img/sharp-win32-ia32@npm:0.33.3":
|
||||
version: 0.33.3
|
||||
resolution: "@img/sharp-win32-ia32@npm:0.33.3"
|
||||
conditions: os=win32 & cpu=ia32
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@img/sharp-win32-x64@npm:0.33.3":
|
||||
version: 0.33.3
|
||||
resolution: "@img/sharp-win32-x64@npm:0.33.3"
|
||||
conditions: os=win32 & cpu=x64
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@internationalized/date@npm:^3.5.2":
|
||||
version: 3.5.2
|
||||
resolution: "@internationalized/date@npm:3.5.2"
|
||||
@ -8601,7 +8785,7 @@ __metadata:
|
||||
react-redux: "npm:8.1.1"
|
||||
react-router-dom: "npm:5.3.4"
|
||||
react-select: "npm:5.7.0"
|
||||
sharp: "npm:0.32.6"
|
||||
sharp: "npm:0.33.3"
|
||||
styled-components: "npm:5.3.3"
|
||||
yup: "npm:0.32.9"
|
||||
peerDependencies:
|
||||
@ -12243,13 +12427,6 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"b4a@npm:^1.6.4":
|
||||
version: 1.6.4
|
||||
resolution: "b4a@npm:1.6.4"
|
||||
checksum: 223158e626a7e024a8d945ce85e7d8871c0689c0375c5b0df5880eedcb5683a12eeb3557591ff5ccd515f3ee8d1664e370c6ff7917fa257405571b81b946604a
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"babel-core@npm:^7.0.0-bridge.0":
|
||||
version: 7.0.0-bridge.0
|
||||
resolution: "babel-core@npm:7.0.0-bridge.0"
|
||||
@ -15024,13 +15201,20 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"detect-libc@npm:^2.0.0, detect-libc@npm:^2.0.2":
|
||||
"detect-libc@npm:^2.0.0":
|
||||
version: 2.0.2
|
||||
resolution: "detect-libc@npm:2.0.2"
|
||||
checksum: 6118f30c0c425b1e56b9d2609f29bec50d35a6af0b762b6ad127271478f3bbfda7319ce869230cf1a351f2b219f39332cde290858553336d652c77b970f15de8
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"detect-libc@npm:^2.0.3":
|
||||
version: 2.0.3
|
||||
resolution: "detect-libc@npm:2.0.3"
|
||||
checksum: b4ea018d623e077bd395f168a9e81db77370dde36a5b01d067f2ad7989924a81d31cb547ff764acb2aa25d50bb7fdde0b0a93bec02212b0cb430621623246d39
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"detect-newline@npm:^3.0.0":
|
||||
version: 3.1.0
|
||||
resolution: "detect-newline@npm:3.1.0"
|
||||
@ -17015,13 +17199,6 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"fast-fifo@npm:^1.1.0, fast-fifo@npm:^1.2.0":
|
||||
version: 1.3.2
|
||||
resolution: "fast-fifo@npm:1.3.2"
|
||||
checksum: 6bfcba3e4df5af7be3332703b69a7898a8ed7020837ec4395bb341bd96cc3a6d86c3f6071dd98da289618cf2234c70d84b2a6f09a33dd6f988b1ff60d8e54275
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"fast-glob@npm:3.2.7":
|
||||
version: 3.2.7
|
||||
resolution: "fast-glob@npm:3.2.7"
|
||||
@ -23669,15 +23846,6 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"node-addon-api@npm:^6.1.0":
|
||||
version: 6.1.0
|
||||
resolution: "node-addon-api@npm:6.1.0"
|
||||
dependencies:
|
||||
node-gyp: "npm:latest"
|
||||
checksum: 8eea1d4d965930a177a0508695beb0d89b4c1d80bf330646a035357a1e8fc31e0d09686e2374996e96e757b947a7ece319f98ede3146683f162597c0bcb4df90
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"node-dir@npm:^0.1.17":
|
||||
version: 0.1.17
|
||||
resolution: "node-dir@npm:0.1.17"
|
||||
@ -26183,13 +26351,6 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"queue-tick@npm:^1.0.1":
|
||||
version: 1.0.1
|
||||
resolution: "queue-tick@npm:1.0.1"
|
||||
checksum: f447926c513b64a857906f017a3b350f7d11277e3c8d2a21a42b7998fa1a613d7a829091e12d142bb668905c8f68d8103416c7197856efb0c72fa835b8e254b5
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"quick-lru@npm:^4.0.1":
|
||||
version: 4.0.1
|
||||
resolution: "quick-lru@npm:4.0.1"
|
||||
@ -27851,6 +28012,17 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"semver@npm:^7.6.0":
|
||||
version: 7.6.0
|
||||
resolution: "semver@npm:7.6.0"
|
||||
dependencies:
|
||||
lru-cache: "npm:^6.0.0"
|
||||
bin:
|
||||
semver: bin/semver.js
|
||||
checksum: 1b41018df2d8aca5a1db4729985e8e20428c650daea60fcd16e926e9383217d00f574fab92d79612771884a98d2ee2a1973f49d630829a8d54d6570defe62535
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"send@npm:0.18.0":
|
||||
version: 0.18.0
|
||||
resolution: "send@npm:0.18.0"
|
||||
@ -27999,20 +28171,72 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"sharp@npm:0.32.6":
|
||||
version: 0.32.6
|
||||
resolution: "sharp@npm:0.32.6"
|
||||
"sharp@npm:0.33.3":
|
||||
version: 0.33.3
|
||||
resolution: "sharp@npm:0.33.3"
|
||||
dependencies:
|
||||
"@img/sharp-darwin-arm64": "npm:0.33.3"
|
||||
"@img/sharp-darwin-x64": "npm:0.33.3"
|
||||
"@img/sharp-libvips-darwin-arm64": "npm:1.0.2"
|
||||
"@img/sharp-libvips-darwin-x64": "npm:1.0.2"
|
||||
"@img/sharp-libvips-linux-arm": "npm:1.0.2"
|
||||
"@img/sharp-libvips-linux-arm64": "npm:1.0.2"
|
||||
"@img/sharp-libvips-linux-s390x": "npm:1.0.2"
|
||||
"@img/sharp-libvips-linux-x64": "npm:1.0.2"
|
||||
"@img/sharp-libvips-linuxmusl-arm64": "npm:1.0.2"
|
||||
"@img/sharp-libvips-linuxmusl-x64": "npm:1.0.2"
|
||||
"@img/sharp-linux-arm": "npm:0.33.3"
|
||||
"@img/sharp-linux-arm64": "npm:0.33.3"
|
||||
"@img/sharp-linux-s390x": "npm:0.33.3"
|
||||
"@img/sharp-linux-x64": "npm:0.33.3"
|
||||
"@img/sharp-linuxmusl-arm64": "npm:0.33.3"
|
||||
"@img/sharp-linuxmusl-x64": "npm:0.33.3"
|
||||
"@img/sharp-wasm32": "npm:0.33.3"
|
||||
"@img/sharp-win32-ia32": "npm:0.33.3"
|
||||
"@img/sharp-win32-x64": "npm:0.33.3"
|
||||
color: "npm:^4.2.3"
|
||||
detect-libc: "npm:^2.0.2"
|
||||
node-addon-api: "npm:^6.1.0"
|
||||
node-gyp: "npm:latest"
|
||||
prebuild-install: "npm:^7.1.1"
|
||||
semver: "npm:^7.5.4"
|
||||
simple-get: "npm:^4.0.1"
|
||||
tar-fs: "npm:^3.0.4"
|
||||
tunnel-agent: "npm:^0.6.0"
|
||||
checksum: f0e4a86881e590f86b05ea463229f62cd29afc2dca08b3f597889f872f118c2c456f382bf2c3e90e934b7a1d30f109cf5ed584cf5a23e79d6b6403a8dc0ebe32
|
||||
detect-libc: "npm:^2.0.3"
|
||||
semver: "npm:^7.6.0"
|
||||
dependenciesMeta:
|
||||
"@img/sharp-darwin-arm64":
|
||||
optional: true
|
||||
"@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: 02bed36749a73c6d56219b86b880458565917d0815746b046aac69dba4afa980d34f3a20631d3146c07bdecd717eb80bf9303df14bcf323575471299ac756da6
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@ -28107,7 +28331,7 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"simple-get@npm:^4.0.0, simple-get@npm:^4.0.1":
|
||||
"simple-get@npm:^4.0.0":
|
||||
version: 4.0.1
|
||||
resolution: "simple-get@npm:4.0.1"
|
||||
dependencies:
|
||||
@ -28822,16 +29046,6 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"streamx@npm:^2.15.0":
|
||||
version: 2.15.1
|
||||
resolution: "streamx@npm:2.15.1"
|
||||
dependencies:
|
||||
fast-fifo: "npm:^1.1.0"
|
||||
queue-tick: "npm:^1.0.1"
|
||||
checksum: 5c5143d832b4d4c2cba09d3e77dcc099f62bfc44bffac38e7b196cdd7f17dcd46bc2012c614fad934c0d706712c2e9455e485435810504cf748906b2f1746837
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"strict-event-emitter@npm:^0.2.4":
|
||||
version: 0.2.8
|
||||
resolution: "strict-event-emitter@npm:0.2.8"
|
||||
@ -29285,17 +29499,6 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"tar-fs@npm:^3.0.4":
|
||||
version: 3.0.4
|
||||
resolution: "tar-fs@npm:3.0.4"
|
||||
dependencies:
|
||||
mkdirp-classic: "npm:^0.5.2"
|
||||
pump: "npm:^3.0.0"
|
||||
tar-stream: "npm:^3.1.5"
|
||||
checksum: 070f35bdde283dbcb05cd22abd5fc1b6df2f190688b8a82d62eadb1fd873e4602586218e88e722b3f292441a651dfb27a9b8e7ef8db6ba5601f93a57a540856a
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"tar-stream@npm:2.2.0, tar-stream@npm:^2.1.4, tar-stream@npm:~2.2.0":
|
||||
version: 2.2.0
|
||||
resolution: "tar-stream@npm:2.2.0"
|
||||
@ -29309,17 +29512,6 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"tar-stream@npm:^3.1.5":
|
||||
version: 3.1.6
|
||||
resolution: "tar-stream@npm:3.1.6"
|
||||
dependencies:
|
||||
b4a: "npm:^1.6.4"
|
||||
fast-fifo: "npm:^1.2.0"
|
||||
streamx: "npm:^2.15.0"
|
||||
checksum: 2c32e0d57de778ae415357bfb126a512a384e9bfb8e234920455ad65282181a3765515bbd80392ab8e7e630158376ec7de46b18ab86a33d256a7dcc43b0648b7
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"tar@npm:6.1.11":
|
||||
version: 6.1.11
|
||||
resolution: "tar@npm:6.1.11"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user