From 2f5a7de356a45a75a685832a7bde81a96d55dd10 Mon Sep 17 00:00:00 2001 From: anho <863612+anho@users.noreply.github.com> Date: Tue, 23 Jul 2024 09:59:37 +0200 Subject: [PATCH] chore: update contentful-management & app-sdk --- apps/singleline-app/package.json | 2 +- package.json | 2 +- packages/_shared/package.json | 4 +- packages/_test/package.json | 6 +- packages/default-field-editors/package.json | 2 +- packages/dropdown/package.json | 2 +- packages/markdown/package.json | 4 +- packages/radio/package.json | 2 +- packages/reference/package.json | 6 +- packages/reference/src/common/EntityStore.tsx | 11 +-- packages/rich-text/package.json | 2 +- packages/slug/package.json | 4 +- yarn.lock | 75 ++++++++++--------- 13 files changed, 61 insertions(+), 61 deletions(-) diff --git a/apps/singleline-app/package.json b/apps/singleline-app/package.json index 066687921..1c05ababf 100644 --- a/apps/singleline-app/package.json +++ b/apps/singleline-app/package.json @@ -3,7 +3,7 @@ "version": "2.0.0", "private": true, "dependencies": { - "@contentful/app-sdk": "^4.17.1", + "@contentful/app-sdk": "^4.29.0", "@contentful/f36-components": "^4.0.27", "@contentful/f36-tokens": "^4.0.0", "@contentful/field-editor-single-line": "^0.15.6", diff --git a/package.json b/package.json index 5db3e606b..80b1d447d 100644 --- a/package.json +++ b/package.json @@ -129,7 +129,7 @@ "babel-preset-react-app": "9.1.2", "react": "16.14.0", "react-dom": "16.14.0", - "@contentful/app-sdk": "4.21.1", + "@contentful/app-sdk": "4.29.0", "@contentful/rich-text-types": "16.7.0" }, "browserslist": { diff --git a/packages/_shared/package.json b/packages/_shared/package.json index 1ffb7b901..1d514b793 100644 --- a/packages/_shared/package.json +++ b/packages/_shared/package.json @@ -35,7 +35,7 @@ "tsc": "tsc -p ./ --noEmit" }, "devDependencies": { - "@contentful/app-sdk": "^4.17.1", + "@contentful/app-sdk": "^4.29.0", "@contentful/field-editor-test-utils": "^1.4.7" }, "dependencies": { @@ -46,7 +46,7 @@ "lodash": "^4.17.15" }, "peerDependencies": { - "@contentful/app-sdk": "^4.17.1", + "@contentful/app-sdk": "^4.29.0", "react": ">=16.8.0" }, "publishConfig": { diff --git a/packages/_test/package.json b/packages/_test/package.json index a861f726b..9a562911f 100644 --- a/packages/_test/package.json +++ b/packages/_test/package.json @@ -35,8 +35,8 @@ "tsc": "tsc -p ./ --noEmit" }, "devDependencies": { - "@contentful/app-sdk": "^4.17.1", - "contentful-management": "^10.0.0", + "@contentful/app-sdk": "^4.29.0", + "contentful-management": "^11.0.0", "type-fest": "^2.16.0" }, "dependencies": { @@ -46,7 +46,7 @@ "mitt": "2.1.0" }, "peerDependencies": { - "@contentful/app-sdk": "^4.17.1", + "@contentful/app-sdk": "^4.29.0", "react": ">=16.8.0" }, "publishConfig": { diff --git a/packages/default-field-editors/package.json b/packages/default-field-editors/package.json index 3c47f0b88..7cbb46576 100644 --- a/packages/default-field-editors/package.json +++ b/packages/default-field-editors/package.json @@ -56,7 +56,7 @@ "@contentful/field-editor-tags": "^1.4.15", "@contentful/field-editor-url": "^1.3.17", "@contentful/field-editor-validation-errors": "^1.3.17", - "contentful-management": "^10.0.0 || ^11.0.0", + "contentful-management": "^11.0.0", "emotion": "^10.0.27" }, "devDependencies": { diff --git a/packages/dropdown/package.json b/packages/dropdown/package.json index 490cfe151..c50a2e946 100644 --- a/packages/dropdown/package.json +++ b/packages/dropdown/package.json @@ -44,7 +44,7 @@ }, "devDependencies": { "@contentful/field-editor-test-utils": "^1.4.7", - "contentful-management": "^10.0.0" + "contentful-management": "^11.0.0" }, "peerDependencies": { "react": ">=16.8.0" diff --git a/packages/markdown/package.json b/packages/markdown/package.json index cca9a0ad8..e1fb1beb0 100644 --- a/packages/markdown/package.json +++ b/packages/markdown/package.json @@ -51,11 +51,11 @@ }, "devDependencies": { "@babel/core": "^7.5.5", - "@contentful/app-sdk": "^4.17.1", + "@contentful/app-sdk": "^4.29.0", "@contentful/field-editor-test-utils": "^1.4.7" }, "peerDependencies": { - "@contentful/app-sdk": "^4.17.1", + "@contentful/app-sdk": "^4.29.0", "react": ">=16.8.0" }, "publishConfig": { diff --git a/packages/radio/package.json b/packages/radio/package.json index c719f2326..db3637549 100644 --- a/packages/radio/package.json +++ b/packages/radio/package.json @@ -45,7 +45,7 @@ }, "devDependencies": { "@contentful/field-editor-test-utils": "^1.4.7", - "contentful-management": "^10.0.0" + "contentful-management": "^11.0.0" }, "peerDependencies": { "react": ">=16.8.0" diff --git a/packages/reference/package.json b/packages/reference/package.json index f1cc7d09d..a7a8147f4 100644 --- a/packages/reference/package.json +++ b/packages/reference/package.json @@ -45,7 +45,7 @@ "@dnd-kit/sortable": "^7.0.2", "@tanstack/react-query": "^4.3.9", "constate": "^3.3.2", - "contentful-management": "^10.14.0 || ^11.0.0", + "contentful-management": "^11.30.0", "emotion": "^10.0.17", "lodash": "^4.17.15", "moment": "^2.20.0", @@ -54,12 +54,12 @@ "type-fest": "2.17.0" }, "devDependencies": { - "@contentful/app-sdk": "^4.17.1", + "@contentful/app-sdk": "^4.29.0", "@contentful/field-editor-test-utils": "^1.4.7", "@testing-library/react-hooks": "^5.0.3" }, "peerDependencies": { - "@contentful/app-sdk": "^4.17.1", + "@contentful/app-sdk": "^4.29.0", "react": ">=16.8.0" }, "publishConfig": { diff --git a/packages/reference/src/common/EntityStore.tsx b/packages/reference/src/common/EntityStore.tsx index 5ecd55cf5..353effd4d 100644 --- a/packages/reference/src/common/EntityStore.tsx +++ b/packages/reference/src/common/EntityStore.tsx @@ -7,17 +7,10 @@ import { PlainClientAPI, createClient, CursorPaginatedCollectionProp, - // fetchAll, + fetchAll, } from 'contentful-management'; import PQueue from 'p-queue'; -async function fetchAll( - fn: (params: { query?: unknown }) => Promise<{ items: T[] }>, - params: { query?: unknown } -): Promise { - return fn(params).then(({ items }) => items); -} - import { Asset, ContentType, @@ -218,7 +211,7 @@ async function fetchExternalResource({ options ), fetch(['resource-types', spaceId, environmentId], ({ cmaClient }) => - fetchAll( + fetchAll( ({ query }) => cmaClient.raw.get>( `/spaces/${spaceId}/environments/${environmentId}/resource_types`, diff --git a/packages/rich-text/package.json b/packages/rich-text/package.json index 5e6c12b25..c5794ae6e 100644 --- a/packages/rich-text/package.json +++ b/packages/rich-text/package.json @@ -38,7 +38,7 @@ "prepublishOnly": "yarn build" }, "dependencies": { - "@contentful/app-sdk": "^4.21.1", + "@contentful/app-sdk": "^4.29.0", "@contentful/contentful-slatejs-adapter": "^15.16.5", "@contentful/f36-components": "^4.67.0", "@contentful/f36-icons": "^4.28.2", diff --git a/packages/slug/package.json b/packages/slug/package.json index 9bc18e93a..2d32fdace 100644 --- a/packages/slug/package.json +++ b/packages/slug/package.json @@ -46,11 +46,11 @@ "use-debounce": "^10.0.0" }, "devDependencies": { - "@contentful/app-sdk": "^4.17.1", + "@contentful/app-sdk": "^4.29.0", "@contentful/field-editor-test-utils": "^1.4.7" }, "peerDependencies": { - "@contentful/app-sdk": "^4.17.1", + "@contentful/app-sdk": "^4.29.0", "react": ">=16.8.0" }, "publishConfig": { diff --git a/yarn.lock b/yarn.lock index 1159c743f..90c1a0cf8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2418,10 +2418,12 @@ open "^8.0.5" ora "^5.4.0" -"@contentful/app-sdk@4.21.1", "@contentful/app-sdk@^4.17.1", "@contentful/app-sdk@^4.21.1", "@contentful/app-sdk@^4.6.0": - version "4.21.1" - resolved "https://registry.yarnpkg.com/@contentful/app-sdk/-/app-sdk-4.21.1.tgz#500ebc69d0a6a6cff5be888aee6cf11e55d602ae" - integrity sha512-sRaWKa18x3EWH84qYHT3W/yXsYKqijgPJgQhGZUcdX9Y3d38ZNOikt/FopE399s/MqyyfVJcM+CFHSC0JczAEw== +"@contentful/app-sdk@4.29.0", "@contentful/app-sdk@^4.17.1", "@contentful/app-sdk@^4.29.0", "@contentful/app-sdk@^4.6.0": + version "4.29.0" + resolved "https://registry.yarnpkg.com/@contentful/app-sdk/-/app-sdk-4.29.0.tgz#ca71dffefc493f07998597799e4c112e7f80e3e5" + integrity sha512-g1PHiCZGImrJq1+ctdb3leCaRrnLaj1yOSHBaibQSzNncH5M5g6zefW7Isy8LHhav5+g+0/WNjsoucBH27d7gg== + dependencies: + contentful-management ">=7.30.0" "@contentful/browserslist-config@^3.0.0": version "3.0.0" @@ -3543,7 +3545,7 @@ dependencies: "@contentful/rich-text-types" "^16.3.5" -"@contentful/rich-text-types@16.7.0", "@contentful/rich-text-types@^15.12.1", "@contentful/rich-text-types@^15.15.1", "@contentful/rich-text-types@^16.0.2", "@contentful/rich-text-types@^16.3.0", "@contentful/rich-text-types@^16.3.5": +"@contentful/rich-text-types@16.7.0", "@contentful/rich-text-types@^15.12.1", "@contentful/rich-text-types@^15.15.1", "@contentful/rich-text-types@^16.0.2", "@contentful/rich-text-types@^16.3.0", "@contentful/rich-text-types@^16.3.5", "@contentful/rich-text-types@^16.6.1": version "16.7.0" resolved "https://registry.yarnpkg.com/@contentful/rich-text-types/-/rich-text-types-16.7.0.tgz#e9a5d59a94867536180a4e506b1745dfe04f83f0" integrity sha512-SMW6JjJpp05CU5xBjIJp9azxFJ/bzcRzd2o9sF49C736m3aCxSobfuUIJz0dHw92MGsiFKAfzn5yTL3JMfqBqg== @@ -9370,6 +9372,15 @@ axios@^1.4.0, axios@^1.6.0, axios@^1.6.1, axios@^1.6.2, axios@^1.6.7: form-data "^4.0.0" proxy-from-env "^1.1.0" +axios@^1.7.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.2.tgz#b625db8a7051fbea61c35a3cbb3a1daa7b9c7621" + integrity sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw== + dependencies: + follow-redirects "^1.15.6" + form-data "^4.0.0" + proxy-from-env "^1.1.0" + axobject-query@~3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-3.1.1.tgz#3b6e5c6d4e43ca7ba51c5babf99d22a9c68485e1" @@ -10865,6 +10876,16 @@ contentful-import@^7.7.0: moment "^2.22.2" yargs "^16.0.3" +contentful-management@>=7.30.0, contentful-management@^11.0.0, contentful-management@^11.30.0: + version "11.30.1" + resolved "https://registry.yarnpkg.com/contentful-management/-/contentful-management-11.30.1.tgz#33788618c60528d3390315e7ce7fd2e4386ea304" + integrity sha512-Td/1QBSaeBEO+YDW4eCt5Gng9p4GvWZsCzdtMh/xJEUMwEAgOmHhIk5abqKFyUWx6psQ+E2xjXW+xvmuYpHb+A== + dependencies: + "@contentful/rich-text-types" "^16.6.1" + axios "^1.7.2" + contentful-sdk-core "^8.3.1" + fast-copy "^3.0.0" + contentful-management@^10.0.0: version "10.46.4" resolved "https://registry.yarnpkg.com/contentful-management/-/contentful-management-10.46.4.tgz#1b7beadd30717d7578c9a7e23b0a42526aebf652" @@ -10878,7 +10899,7 @@ contentful-management@^10.0.0: lodash.isplainobject "^4.0.6" type-fest "^4.0.0" -"contentful-management@^10.0.0 || ^11.0.0", "contentful-management@^10.14.0 || ^11.0.0", contentful-management@^11.0.1: +contentful-management@^11.0.1: version "11.25.0" resolved "https://registry.yarnpkg.com/contentful-management/-/contentful-management-11.25.0.tgz#3b9689871dafde9f32c44b889736f061cc5508d8" integrity sha512-w5OqoCSzHbKXzGvgjGcQL7zCW2AKHRvSPJ5cMAAdLvPmY9vbJXXv8IucEEiAZO5yS6RUL1Pc7KXASqSnUyHoIw== @@ -10985,6 +11006,17 @@ contentful-sdk-core@^8.1.0: p-throttle "^4.1.1" qs "^6.11.2" +contentful-sdk-core@^8.3.1: + version "8.3.1" + resolved "https://registry.yarnpkg.com/contentful-sdk-core/-/contentful-sdk-core-8.3.1.tgz#773d59f286d1bd8e50a3ffd9e3f4f410da6fb929" + integrity sha512-HYy4ecFA76ERxz7P0jW7hgDcL8jH+bRckv2QfAwQ4k1yPP9TvxpZwrKnlLM69JOStxVkCXP37HvbjbFnjcoWdg== + dependencies: + fast-copy "^2.1.7" + lodash.isplainobject "^4.0.6" + lodash.isstring "^4.0.1" + p-throttle "^4.1.1" + qs "^6.11.2" + contentful@^10.6.9: version "10.8.8" resolved "https://registry.yarnpkg.com/contentful/-/contentful-10.8.8.tgz#f96f6e69c22a35de4891594a4385ec4b93c23c7b" @@ -23359,7 +23391,7 @@ string-natural-compare@^3.0.1: resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4" integrity sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw== -"string-width-cjs@npm:string-width@^4.2.0": +"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -23377,15 +23409,6 @@ string-width@^1.0.1: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - string-width@^2.0.0, string-width@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" @@ -23503,7 +23526,7 @@ stringify-object@^3.3.0: is-obj "^1.0.1" is-regexp "^1.0.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -23531,13 +23554,6 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - strip-ansi@^7.0.0, strip-ansi@^7.0.1: version "7.1.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" @@ -25856,7 +25872,7 @@ workerpool@^6.5.1: resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544" integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -25891,15 +25907,6 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"