Skip to content

Commit

Permalink
Merge branch 'main' into fix/service-typings
Browse files Browse the repository at this point in the history
  • Loading branch information
@Bassel17
Bassel17 committed Aug 23, 2022
2 parents 4fd4c7f + 4eb360c commit 48188bd
Show file tree
Hide file tree
Showing 9 changed files with 99 additions and 70 deletions.
2 changes: 1 addition & 1 deletion packages/core/admin/package.json
View file
Expand Up @@ -113,7 +113,7 @@
"react-error-boundary": "3.1.1",
"react-fast-compare": "^3.2.0",
"react-helmet": "^6.1.0",
"react-intl": "5.20.2",
"react-intl": "5.25.1",
"react-is": "^17.0.2",
"react-query": "3.24.3",
"react-redux": "7.2.8",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/content-type-builder/package.json
View file
Expand Up @@ -36,7 +36,7 @@
"pluralize": "^8.0.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-intl": "5.20.2",
"react-intl": "5.25.1",
"react-redux": "7.2.8",
"react-router": "^5.2.0",
"react-router-dom": "5.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/helper-plugin/package.json
View file
Expand Up @@ -55,7 +55,7 @@
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-helmet": "^6.1.0",
"react-intl": "5.20.2",
"react-intl": "5.25.1",
"react-router": "^5.2.0",
"react-router-dom": "5.2.0",
"react-select": "4.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/upload/package.json
View file
Expand Up @@ -38,7 +38,7 @@
"react": "^17.0.2",
"react-copy-to-clipboard": "^5.1.0",
"react-dom": "^17.0.2",
"react-intl": "5.20.2",
"react-intl": "5.25.1",
"react-redux": "7.2.8",
"react-router": "^5.2.0",
"react-router-dom": "5.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/documentation/package.json
View file
Expand Up @@ -36,7 +36,7 @@
"react": "^17.0.2",
"react-copy-to-clipboard": "^5.1.0",
"react-dom": "^17.0.2",
"react-intl": "5.20.2",
"react-intl": "5.25.1",
"react-redux": "7.2.8",
"react-router": "^5.2.0",
"react-router-dom": "5.2.0",
Expand Down
10 changes: 8 additions & 2 deletions packages/plugins/documentation/server/services/helpers/build-component-schema.js
View file
Expand Up @@ -68,7 +68,10 @@ const getAllSchemasForContentType = ({ routeInfo, attributes, uniqueName }) => {
[`${pascalCase(uniqueName)}LocalizationRequest`]: {
required: [...requiredAttributes, 'locale'],
type: 'object',
properties: cleanSchemaAttributes(attributesForRequest, { isRequest: true, addComponentSchema }),
properties: cleanSchemaAttributes(attributesForRequest, {
isRequest: true,
addComponentSchema,
}),
},
};
}
Expand All @@ -83,7 +86,10 @@ const getAllSchemasForContentType = ({ routeInfo, attributes, uniqueName }) => {
data: {
required: requiredAttributes,
type: 'object',
properties: cleanSchemaAttributes(attributesForRequest, { isRequest: true, addComponentSchema }),
properties: cleanSchemaAttributes(attributesForRequest, {
isRequest: true,
addComponentSchema,
}),
},
},
},
Expand Down
13 changes: 11 additions & 2 deletions packages/plugins/documentation/server/services/helpers/utils/clean-schema-attributes.js
View file
Expand Up @@ -12,7 +12,12 @@ const pascalCase = require('./pascal-case');
*/
const cleanSchemaAttributes = (
attributes,
{ typeMap = new Map(), isRequest = false, addComponentSchema = () => {}, componentSchemaRefName = '' } = {}
{
typeMap = new Map(),
isRequest = false,
addComponentSchema = () => {},
componentSchemaRefName = '',
} = {}
) => {
const attributesCopy = _.cloneDeep(attributes);

Expand Down Expand Up @@ -125,7 +130,11 @@ const cleanSchemaAttributes = (
properties: {
...(isRequest ? {} : { id: { type: 'string' } }),
__component: { type: 'string' },
...cleanSchemaAttributes(componentAttributes, { typeMap, isRequest, addComponentSchema }),
...cleanSchemaAttributes(componentAttributes, {
typeMap,
isRequest,
addComponentSchema,
}),
},
};
const refComponentSchema = { $ref: `#/components/schemas/${pascalCase(component)}` };
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/users-permissions/package.json
View file
Expand Up @@ -37,7 +37,7 @@
"purest": "4.0.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-intl": "5.20.2",
"react-intl": "5.25.1",
"react-redux": "7.2.8",
"react-router": "^5.2.0",
"react-router-dom": "5.2.0",
Expand Down
134 changes: 74 additions & 60 deletions yarn.lock
View file
Expand Up @@ -1832,62 +1832,74 @@
dependencies:
tslib "^2.0.1"

"@formatjs/ecma402-abstract@1.9.3":
version "1.9.3"
resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.9.3.tgz#00892014c805935b5b1345d238246e9bf3a2de50"
integrity sha512-DBrRUL65m4SVtfq+T4Qltd8+upAzfb9K1MX0UZ0hqQ0wpBY0PSIti9XJe0ZQ/j2v/KxpwQ0Jw5NLumKVezJFQg==
"@formatjs/ecma402-abstract@1.11.4":
version "1.11.4"
resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.11.4.tgz#b962dfc4ae84361f9f08fbce411b4e4340930eda"
integrity sha512-EBikYFp2JCdIfGEb5G9dyCkTGDmC57KSHhRQOC3aYxoPWVZvfWCDjZwkGYHN7Lis/fmuWl906bnNTJifDQ3sXw==
dependencies:
"@formatjs/intl-localematcher" "0.2.25"
tslib "^2.1.0"

"@formatjs/fast-memoize@1.1.1":
version "1.1.1"
resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-1.1.1.tgz#3006b58aca1e39a98aca213356b42da5d173f26b"
integrity sha512-mIqBr5uigIlx13eZTOPSEh2buDiy3BCdMYUtewICREQjbb4xarDiVWoXSnrERM7NanZ+0TAHNXSqDe6HpEFQUg==
"@formatjs/fast-memoize@1.2.1":
version "1.2.1"
resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-1.2.1.tgz#e6f5aee2e4fd0ca5edba6eba7668e2d855e0fc21"
integrity sha512-Rg0e76nomkz3vF9IPlKeV+Qynok0r7YZjL6syLz4/urSg0IbjPZCB/iYUMNsYA643gh4mgrX3T7KEIFIxJBQeg==
dependencies:
tslib "^2.1.0"

"@formatjs/icu-messageformat-parser@2.0.6":
version "2.0.6"
resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.0.6.tgz#7471c2116982f07b3d9b80e4572a870f20adbaf6"
integrity sha512-dgOZ2kq3sbjjC4P0IIghXFUiGY+x9yyypBJF9YFACjw8gPq/OSPmOzdMGvjY9hl4EeeIhhsDd4LIAN/3zHG99A==
"@formatjs/icu-messageformat-parser@2.1.0":
version "2.1.0"
resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.1.0.tgz#a54293dd7f098d6a6f6a084ab08b6d54a3e8c12d"
integrity sha512-Qxv/lmCN6hKpBSss2uQ8IROVnta2r9jd3ymUEIjm2UyIkUCHVcbUVRGL/KS/wv7876edvsPe+hjHVJ4z8YuVaw==
dependencies:
"@formatjs/ecma402-abstract" "1.9.3"
"@formatjs/icu-skeleton-parser" "1.2.7"
"@formatjs/ecma402-abstract" "1.11.4"
"@formatjs/icu-skeleton-parser" "1.3.6"
tslib "^2.1.0"

"@formatjs/icu-skeleton-parser@1.2.7":
version "1.2.7"
resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.2.7.tgz#a74954695c37470efdeff828799654088e567c34"
integrity sha512-xm1rJMOz4fwVfWH98VKtbTpZvyQ45plHilkCF16Nm6bAgosYC/IcMmgJisGr6uHqb5TvJRXE07+EvnkIIQjsdA==
"@formatjs/icu-skeleton-parser@1.3.6":
version "1.3.6"
resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.6.tgz#4ce8c0737d6f07b735288177049e97acbf2e8964"
integrity sha512-I96mOxvml/YLrwU2Txnd4klA7V8fRhb6JG/4hm3VMNmeJo1F03IpV2L3wWt7EweqNLES59SZ4d6hVOPCSf80Bg==
dependencies:
"@formatjs/ecma402-abstract" "1.9.3"
"@formatjs/ecma402-abstract" "1.11.4"
tslib "^2.1.0"

"@formatjs/intl-displaynames@5.1.5":
version "5.1.5"
resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-5.1.5.tgz#fb65c09493c3488e11e72b7d9512f0c1cc18b247"
integrity sha512-338DoPv8C4BqLqE7Sn5GkJbbkpL0RG8VoMP6qMJywx7bXVgOdWXiXUl3owdCPvq0bpVGGxTl+UNnF+UH8wGdLg==
"@formatjs/intl-displaynames@5.4.3":
version "5.4.3"
resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-5.4.3.tgz#e468586694350c722c7efab1a31fcde68aeaed8b"
integrity sha512-4r12A3mS5dp5hnSaQCWBuBNfi9Amgx2dzhU4lTFfhSxgb5DOAiAbMpg6+7gpWZgl4ahsj3l2r/iHIjdmdXOE2Q==
dependencies:
"@formatjs/ecma402-abstract" "1.9.3"
"@formatjs/ecma402-abstract" "1.11.4"
"@formatjs/intl-localematcher" "0.2.25"
tslib "^2.1.0"

"@formatjs/intl-listformat@6.2.5":
version "6.2.5"
resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-6.2.5.tgz#b2534700807e3ca2c2d8180592c15751037c908a"
integrity sha512-LRGroM+uLc8dL5J8zwHhNNxWw45nnHQMphW3zEnD9AySKPbFRsrSxzV8LYA93U5mkvMSBf49RdEODpdeyDak/Q==
"@formatjs/intl-listformat@6.5.3":
version "6.5.3"
resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-6.5.3.tgz#f29da613a8062dc3e4e3d847ba890c3ea745f051"
integrity sha512-ozpz515F/+3CU+HnLi5DYPsLa6JoCfBggBSSg/8nOB5LYSFW9+ZgNQJxJ8tdhKYeODT+4qVHX27EeJLoxLGLNg==
dependencies:
"@formatjs/ecma402-abstract" "1.9.3"
"@formatjs/ecma402-abstract" "1.11.4"
"@formatjs/intl-localematcher" "0.2.25"
tslib "^2.1.0"

"@formatjs/intl@1.13.0":
version "1.13.0"
resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-1.13.0.tgz#31f11d88220b6b864e58d3a7c7cb46e3cee62bf3"
integrity sha512-Wu8NU+OT9ZmkRSeIfKBY8GRrsCpF/Abc7v6Q8wHzA/VxT7HZblhO8YryALISqc0Vdmq4xUnvbrX4cSNSXdafZg==
dependencies:
"@formatjs/ecma402-abstract" "1.9.3"
"@formatjs/fast-memoize" "1.1.1"
"@formatjs/icu-messageformat-parser" "2.0.6"
"@formatjs/intl-displaynames" "5.1.5"
"@formatjs/intl-listformat" "6.2.5"
intl-messageformat "9.6.18"
"@formatjs/intl-localematcher@0.2.25":
version "0.2.25"
resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.2.25.tgz#60892fe1b271ec35ba07a2eb018a2dd7bca6ea3a"
integrity sha512-YmLcX70BxoSopLFdLr1Ds99NdlTI2oWoLbaUW2M406lxOIPzE1KQhRz2fPUkq34xVZQaihCoU29h0KK7An3bhA==
dependencies:
tslib "^2.1.0"

"@formatjs/intl@2.2.1":
version "2.2.1"
resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-2.2.1.tgz#6daf4dabed055b17f467f0aa1bc073a626bc9189"
integrity sha512-vgvyUOOrzqVaOFYzTf2d3+ToSkH2JpR7x/4U1RyoHQLmvEaTQvXJ7A2qm1Iy3brGNXC/+/7bUlc3lpH+h/LOJA==
dependencies:
"@formatjs/ecma402-abstract" "1.11.4"
"@formatjs/fast-memoize" "1.2.1"
"@formatjs/icu-messageformat-parser" "2.1.0"
"@formatjs/intl-displaynames" "5.4.3"
"@formatjs/intl-listformat" "6.5.3"
intl-messageformat "9.13.0"
tslib "^2.1.0"

"@fortawesome/fontawesome-common-types@6.1.2":
Expand Down Expand Up @@ -6055,10 +6067,10 @@
dependencies:
"@types/react" "*"

"@types/react@*":
version "18.0.15"
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.15.tgz#d355644c26832dc27f3e6cbf0c4f4603fc4ab7fe"
integrity sha512-iz3BtLuIYH1uWdsv6wXYdhozhqj20oD4/Hk2DNXIn1kFsmp9x8d9QB6FnPhfkbhd2PgEONt9Q1x/ebkwjfFLow==
"@types/react@*", "@types/react@16 || 17 || 18":
version "18.0.17"
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.17.tgz#4583d9c322d67efe4b39a935d223edcc7050ccf4"
integrity sha512-38ETy4tL+rn4uQQi7mB81G7V1g0u2ryquNmsVIOKUAEIDK+3CUjZ6rSRpdvS99dNBnkLFL83qfmtLacGOTIhwQ==
dependencies:
"@types/prop-types" "*"
"@types/scheduler" "*"
Expand Down Expand Up @@ -13326,13 +13338,14 @@ interpret@^2.2.0:
resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9"
integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==

intl-messageformat@9.6.18:
version "9.6.18"
resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-9.6.18.tgz#785cc0c44a1a288fbbda63308907c3eab4eebe9f"
integrity sha512-phG2EtMS/J6C4pcbErPkTSoqJ+T6qNfPVWTv5cDnI/nuCDKRUHPLDp4QpMdxIWPSUYPj7Lq69vMEIqg91x+H1Q==
intl-messageformat@9.13.0:
version "9.13.0"
resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-9.13.0.tgz#97360b73bd82212e4f6005c712a4a16053165468"
integrity sha512-7sGC7QnSQGa5LZP7bXLDhVDtQOeKGeBFGHF2Y8LVBwYZoQZCgWeKoPGTa5GMG8g/TzDgeXuYJQis7Ggiw2xTOw==
dependencies:
"@formatjs/fast-memoize" "1.1.1"
"@formatjs/icu-messageformat-parser" "2.0.6"
"@formatjs/ecma402-abstract" "1.11.4"
"@formatjs/fast-memoize" "1.2.1"
"@formatjs/icu-messageformat-parser" "2.1.0"
tslib "^2.1.0"

into-stream@^5.1.0:
Expand Down Expand Up @@ -18890,19 +18903,20 @@ react-inspector@^5.1.0:
is-dom "^1.0.0"
prop-types "^15.0.0"

react-intl@5.20.2:
version "5.20.2"
resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-5.20.2.tgz#e453889e028502b9913e4ed1c35642ec74daba05"
integrity sha512-Uv3OydXIjF1wABfUm0mI8SItNQW7zuFaU42W0qXYVRvSoRXMv9rUorC1FLHTiS5zifQCRvWs65VejL8PO5he8w==
react-intl@5.25.1:
version "5.25.1"
resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-5.25.1.tgz#68a73aefc485c9bf70062381ae7f6f4791680879"
integrity sha512-pkjdQDvpJROoXLMltkP/5mZb0/XqrqLoPGKUCfbdkP8m6U9xbK40K51Wu+a4aQqTEvEK5lHBk0fWzUV72SJ3Hg==
dependencies:
"@formatjs/ecma402-abstract" "1.9.3"
"@formatjs/icu-messageformat-parser" "2.0.6"
"@formatjs/intl" "1.13.0"
"@formatjs/intl-displaynames" "5.1.5"
"@formatjs/intl-listformat" "6.2.5"
"@formatjs/ecma402-abstract" "1.11.4"
"@formatjs/icu-messageformat-parser" "2.1.0"
"@formatjs/intl" "2.2.1"
"@formatjs/intl-displaynames" "5.4.3"
"@formatjs/intl-listformat" "6.5.3"
"@types/hoist-non-react-statics" "^3.3.1"
"@types/react" "16 || 17 || 18"
hoist-non-react-statics "^3.3.2"
intl-messageformat "9.6.18"
intl-messageformat "9.13.0"
tslib "^2.1.0"

react-is@17.0.2, react-is@^17.0.1, react-is@^17.0.2:
Expand Down

0 comments on commit 48188bd

Please sign in to comment.