yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2026-01-05 19:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into fix/transfer-wrong-url

Browse Source
This commit is contained in:
Bassel Kanso 2023-03-23 15:36:29 +02:00 committed by GitHub
commit 6716316ad2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/admin/package.json
View File

@ -112,7 +112,7 @@
"react": "^17.0.2",
"react-copy-to-clipboard": "^5.1.0",
"react-dnd": "15.1.2",
"react-dnd-html5-backend": "15.1.2",
"react-dnd-html5-backend": "15.1.3",
"react-dom": "^17.0.2",
"react-error-boundary": "3.1.4",
"react-fast-compare": "^3.2.0",

8
packages/plugins/i18n/server/constants/iso-locales.json
View File

@ -139,6 +139,14 @@
"code":"as-IN",
"name":"Assamese (India) (as-IN)"
},
{
"code":"ast",
"name":"Asturian (ast)"
},
{
"code":"ast-ES",
"name":"Asturian (Spain) (ast-ES)"
},
{
"code":"asa",
"name":"Asu (asa)"

8
packages/plugins/i18n/server/services/__tests__/__snapshots__/iso-locales.test.js.snap
View File

@ -142,6 +142,14 @@ exports[`ISO locales getIsoLocales 1`] = `
"code": "as-IN",
"name": "Assamese (India) (as-IN)",
},
{
"code": "ast",
"name": "Asturian (ast)",
},
{
"code": "ast-ES",
"name": "Asturian (Spain) (ast-ES)",
},
{
"code": "asa",
"name": "Asu (asa)",

31
yarn.lock
View File

@ -3583,21 +3583,11 @@
dependencies:
"@babel/runtime" "^7.13.10"
"@react-dnd/asap@4.0.0":
version "4.0.0"
resolved "https://registry.yarnpkg.com/@react-dnd/asap/-/asap-4.0.0.tgz#b300eeed83e9801f51bd66b0337c9a6f04548651"
integrity sha512-0XhqJSc6pPoNnf8DhdsPHtUhRzZALVzYMTzRwV4VI6DJNJ/5xxfL9OQUwb8IH5/2x7lSf7nAZrnzUD+16VyOVQ==
"@react-dnd/asap@4.0.1":
version "4.0.1"
resolved "https://registry.yarnpkg.com/@react-dnd/asap/-/asap-4.0.1.tgz#5291850a6b58ce6f2da25352a64f1b0674871aab"
integrity sha512-kLy0PJDDwvwwTXxqTFNAAllPHD73AycE9ypWeln/IguoGBEbvFcPDbCV03G52bEcC5E+YgupBE0VzHGdC8SIXg==
"@react-dnd/invariant@3.0.0":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@react-dnd/invariant/-/invariant-3.0.0.tgz#ea55db612b8be3284e87b67f1a1567595cd4c386"
integrity sha512-keberJRIqPX15IK3SWS/iO1t/kGETiL1oczKrDitAaMnQ+kpHf81l3MrRmFjvfqcnApE+izEvwM6GsyoIcpsVA==
"@react-dnd/invariant@3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@react-dnd/invariant/-/invariant-3.0.1.tgz#7e70be19ea21b539e8bf1da28466f4f05df2a4cc"
@ -9956,15 +9946,6 @@ dkim-signer@0.2.2:
dependencies:
libmime "^2.0.3"
dnd-core@15.1.1:
version "15.1.1"
resolved "https://registry.yarnpkg.com/dnd-core/-/dnd-core-15.1.1.tgz#b4dce2d892be2a7c9ca32ffdd545350be8d52f4f"
integrity sha512-Mtj/Sltcx7stVXzeDg4g7roTe/AmzRuIf/FYOxX6F8gULbY54w066BlErBOzQfn9RIJ3gAYLGX7wvVvoBSq7ig==
dependencies:
"@react-dnd/asap" "4.0.0"
"@react-dnd/invariant" "3.0.0"
redux "^4.1.1"
dnd-core@15.1.2:
version "15.1.2"
resolved "https://registry.yarnpkg.com/dnd-core/-/dnd-core-15.1.2.tgz#0983bce555c4985f58b731ffe1faed31e1ea7f6f"
@ -18646,12 +18627,12 @@ react-copy-to-clipboard@^5.1.0:
copy-to-clipboard "^3.3.1"
prop-types "^15.8.1"
react-dnd-html5-backend@15.1.2:
version "15.1.2"
resolved "https://registry.yarnpkg.com/react-dnd-html5-backend/-/react-dnd-html5-backend-15.1.2.tgz#85e2c5ad57e87190495756f68f44fd89299062fb"
integrity sha512-mem9QbutUF+aA2YC1y47G3ECjnYV/sCYKSnu5Jd7cbg3fLMPAwbnTf/JayYdnCH5l3eg9akD9dQt+cD0UdF8QQ==
react-dnd-html5-backend@15.1.3:
version "15.1.3"
resolved "https://registry.yarnpkg.com/react-dnd-html5-backend/-/react-dnd-html5-backend-15.1.3.tgz#57b4f47e0f23923e7c243d2d0eefe490069115a9"
integrity sha512-HH/8nOEmrrcRGHMqJR91FOwhnLlx5SRLXmsQwZT3IPcBjx88WT+0pWC5A4tDOYDdoooh9k+KMPvWfxooR5TcOA==
dependencies:
dnd-core "15.1.1"
dnd-core "15.1.2"
react-dnd@15.1.2:
version "15.1.2"
@ -19071,7 +19052,7 @@ redent@^3.0.0:
indent-string "^4.0.0"
strip-indent "^3.0.0"
redux@^4.1.1, redux@^4.1.2:
redux@^4.1.2:
version "4.2.0"
resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.0.tgz#46f10d6e29b6666df758780437651eeb2b969f13"
integrity sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA==